From a858fdf55752cc8278cd4059aecdc9391fed37aa Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Mon, 16 May 2005 14:26:51 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 +++++- catalyst | 5 +++-- modules/snapshot_target.py | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d260fd75..2e7c8b65 100644 --- 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 catalyst, + modules/snapshot_target.py: + Fix snapshot target to skip the kill_pids check 06 May 2005; Eric Edgar modules/catalyst_support.py: Bug fixes in parse_spec, fix issues detecting list or string. diff --git a/catalyst b/catalyst index 8c49dd01..6561ba59 100755 --- 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 @@ -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 e19bf3e3..806da494 100644 --- 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..." -- 2.26.2