Fix snapshot target to skip the kill_pids check

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

diff --git a/ChangeLog b/ChangeLog
index d260fd75f94c97cd6dbba25cd88d60f716eda6ed..2e7c8b656b725490d03d84b34389ddabfcc659af 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.258 2005/05/06 17:48:59 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.259 2005/05/16 14:26:50 rocket Exp $
+
+  16 May 2005; Eric Edgar <rocket@gentoo.org> catalyst,
+  modules/snapshot_target.py:
+  Fix snapshot target to skip the kill_pids check
 
   06 May 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py:
   Bug fixes in parse_spec, fix issues detecting list or string.

diff --git a/catalyst b/catalyst
index 8c49dd01a42267ef30105a8453e42141e6438919..6561ba591b17005f5f709eba9e742bef865f3dc0 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.80 2005/05/05 21:16:06 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.81 2005/05/16 14:26:50 rocket Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -353,5 +353,6 @@ if __name__ == "__main__":
                print "\nproblem with command line or spec file ( Key Error )"
                sys.exit(2)
        except:
-               print "Catalyst aborting ...."
+               print "Catalyst aborting...."
+               raise
                sys.exit(2)

diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index e19bf3e302a3cb68db8ebfe2668c6b9592eb10d9..806da49462454134ad07cb5b15e4e5f69f7d2c82 100644 (file)
--- a/modules/snapshot_target.py
+++ b/modules/snapshot_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/snapshot_target.py,v 1.9 2005/04/27 17:44:58 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/snapshot_target.py,v 1.10 2005/05/16 14:26:51 rocket Exp $
 
 """
 Builder class for snapshots.
@@ -53,6 +53,9 @@ class snapshot_target(generic_target):
                        "Snapshot creation failure")
                self.cleanup()
                print "snapshot: complete!"
+       
+       def kill_chroot_pids(self):
+               pass
 
        def cleanup(self):
                print "Cleaning up..."