bugfix #58208

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

diff --git a/ChangeLog b/ChangeLog
index 92871b9f08cc244e021dc6d3acd520fc40d3ad24..402cf6fa249dec7230fc39a91050fc2573cbcb56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.75 2004/08/02 23:48:15 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.76 2004/08/03 00:09:24 zhen Exp $
+
+  02 Aug 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py:
+  fix for bug #58208
 
   02 Aug 2004; John Davis <zhen@gentoo.org>
   livecd/runscript-support/livecdfs-update.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index bed9b6d6142eeda188fb27e803ad5a2e4837d05e..1e694e6fc3aaccf343f51950969ff96200f2fc3f 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.8 2004/08/02 23:23:34 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.9 2004/08/03 00:09:24 zhen Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -368,8 +368,7 @@ class generic_stage_target(generic_target):
                        myf.close()
                        outf.close()
                        os.rename(self.settings["chroot_path"]+"/tmp/out.txt",self.settings["chroot_path"]+"/etc/passwd")
-                       cmd("/usr/bin/pkill -U 7980","could not kill distcc process(es)")
-                       
+                                               
                try:
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+\
                                "/"+self.settings["target"]+".sh preclean","preclean script failed.")
@@ -446,6 +445,10 @@ class generic_stage_target(generic_target):
                        self.unmerge()
                self.unbind()
                
+               # kill distcc processes outside of the chroot
+               if self.settings.has_key("DISTCC"): 
+                       cmd("/usr/bin/pkill -U 7980","could not kill distcc process(es)")
+
                if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage2"]:
                        # clean is for removing things after bind-mounts are 
                        # unmounted (general file removal and cleanup)