chownDirectory recursif

slapos/format.py

@@ -65,6 +65,7 @@ def prettify_xml(xml):
 
 
 from slapos.util import mkdir_p
+from slapos.util import chownDirectory
 
 class OS(object):
   """Wrap parts of the 'os' module to provide logging of performed actions."""
@@ -383,7 +384,7 @@ class Computer(object):
     if alter_user:
       slapsoft.create()
       slapsoft_pw = pwd.getpwnam(slapsoft.name)
-      os.chown(self.software_root, slapsoft_pw.pw_uid, slapsoft_pw.pw_gid)
+      chownDirectory(path, uid, gid)
     os.chmod(self.software_root, 0755)
 
     # Speed hack:
@@ -505,7 +506,7 @@ class Partition(object):
       os.mkdir(self.path, 0750)
     if alter_user:
       owner_pw = pwd.getpwnam(owner.name)
-      os.chown(self.path, owner_pw.pw_uid, owner_pw.pw_gid)
+      chownDirectory(path, uid, gid)
     os.chmod(self.path, 0750)
 
 

slapos/util.py

@@ -17,3 +17,9 @@ def mkdir_p(path, mode=0o777):
         else:
             raise
 
+def chownDirectory(path, uid, gid):
+  for root, dirs, files in os.walk(path):
+    for items in dirs, files:
+      for item in items:
+        os.chown(os.path.join(root, item), uid, gid)
+