Fix print statement so it shows when kill_chroot_pids is run correctly

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

diff --git a/ChangeLog b/ChangeLog
index 2e7c8b656b725490d03d84b34389ddabfcc659af..8381603539a7b93323d04ef5cc1ae1d890a6eb35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.259 2005/05/16 14:26:50 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.260 2005/05/18 18:09:14 rocket Exp $
+
+  18 May 2005; Eric Edgar <rocket@gentoo.org> catalyst,
+  modules/generic_stage_target.py:
+  Fix print statement so it shows when kill_chroot_pids is run correctly
 
   16 May 2005; Eric Edgar <rocket@gentoo.org> catalyst,
   modules/snapshot_target.py:

diff --git a/catalyst b/catalyst
index 6561ba591b17005f5f709eba9e742bef865f3dc0..fee23d9e85f68bc59f364d2cc10f79d19f02b065 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.81 2005/05/16 14:26:50 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.82 2005/05/18 18:09:14 rocket Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -184,7 +184,6 @@ def build_target(addlargs, targetmap):
                mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
        
                # Kill any pids in the chroot 
-               print "Checking for processes running in chroot and killing them."
                mytarget.kill_chroot_pids()
 
                # Check for mounts right away and abort if we cannot unmount them.

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 2086f2e0eb4509a933da6e12c84a1ebb401ac1dc..73a4258c31fd04cb3599af99aae031435474b111 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.45 2005/05/03 14:58:52 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.46 2005/05/18 18:09:14 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -392,6 +392,8 @@ class generic_stage_target(generic_target):
                del self.settings[self.settings["spec_prefix"]+"/gk_mainargs"]
 
        def kill_chroot_pids(self):
+           print "Checking for processes running in chroot and killing them."
+           
            # Force environment variables to be exported so script can see them
            self.setup_environment()