fix for #76530

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@509 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 6365aa8dd902b0c75ef016d33babef00029c8717..01d5ace45506623489c7257d9d47062e593e6963 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.136 2005/01/04 21:33:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.137 2005/01/04 23:54:59 zhen Exp $
+
+  04 Jan 2005; John Davis <zhen@gentoo.org> modules/generic_stage_target.py,
+  modules/livecd_stage2_target.py:
+  fix for #76530
 
   04 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   -livecd/cdtar/isolinux-2.08-cdtar.tar.bz2,

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index c1f31a6f985023739ac5d071480a42a665e5622b..ed3cc3938378be340765d9a58faaf899266f0902 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.21 2005/01/04 21:13:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.22 2005/01/04 23:54:59 zhen Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -212,14 +212,14 @@ class generic_stage_target(generic_target):
                                "Could not remove existing directory: "+self.settings["chroot_path"])
                        
                if not os.path.exists(self.settings["chroot_path"]+"/tmp"):
-                       os.makedirs(self.settings["chroot_path"]+"/tmp")
+                       os.makedirs(self.settings["chroot_path"]+"/tmp",1777)
                        
                if not os.path.exists(self.settings["chroot_path"]):
-                       os.makedirs(self.settings["chroot_path"])
+                       os.makedirs(self.settings["chroot_path"],0755)
                
                if self.settings.has_key("PKGCACHE"):   
                        if not os.path.exists(self.settings["pkgcache_path"]):
-                               os.makedirs(self.settings["pkgcache_path"])
+                               os.makedirs(self.settings["pkgcache_path"],0755)
        
                
        def unpack_and_bind(self):
@@ -250,10 +250,10 @@ class generic_stage_target(generic_target):
 
                for x in self.mounts: 
                        if not os.path.exists(self.settings["chroot_path"]+x):
-                               os.makedirs(self.settings["chroot_path"]+x)
+                               os.makedirs(self.settings["chroot_path"]+x,0755)
                        
                        if not os.path.exists(self.mountmap[x]):
-                               os.makedirs(self.mountmap[x])
+                               os.makedirs(self.mountmap[x],0755)
                        
                        src=self.mountmap[x]
                        retval=os.system("mount --bind "+src+" "+self.settings["chroot_path"]+x)

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 2ca69c2aa388e78907e5faf23d7c6ec3f5d811d9..1ab89736ff080b9c66e1b9e3d3332e6f4e30e2d9 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.27 2005/01/04 21:13:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.28 2005/01/04 23:54:59 zhen Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -78,9 +78,9 @@ class livecd_stage2_target(generic_stage_target):
 
                for x in self.mounts: 
                        if not os.path.exists(self.settings["chroot_path"]+x):
-                               os.makedirs(self.settings["chroot_path"]+x)
+                               os.makedirs(self.settings["chroot_path"]+x,0755)
                        if not os.path.exists(self.mountmap[x]):
-                               os.makedirs(self.mountmap[x])
+                               os.makedirs(self.mountmap[x],0755)
                        src=self.mountmap[x]
                        retval=os.system("mount --bind "+src+" "+self.settings["chroot_path"]+x)
                        if retval!=0:
@@ -154,7 +154,7 @@ class livecd_stage2_target(generic_stage_target):
                                # the proper perms and ownership
                                mystat=os.stat(myemp)
                                shutil.rmtree(myemp)
-                               os.makedirs(myemp)
+                               os.makedirs(myemp,0755)
                                os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
                                os.chmod(myemp,mystat[ST_MODE])