Optimize catalyst bytecode and set a sane sys.exit for keyboard interrupts

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

diff --git a/ChangeLog b/ChangeLog
index de606d7ab663bd213438a037ddf972734bb22a28..d143c5d6af7c7bd177c53786c90e4902c9629154 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.466 2005/12/19 15:36:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.467 2005/12/19 15:48:00 rocket Exp $
+
+  19 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst:
+  Optimize catalyst bytecode and set a sane sys.exit for keyboard interrupts
 
   19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage4/stage4-chroot.sh, targets/stage4/stage4-controller.sh,

diff --git a/catalyst b/catalyst
index f949e057f1b9b3f5c489833d130a5cc792ddf87f..8f7081df0d1715eafea78404d09e20e488fec001 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.114 2005/12/13 22:52:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.115 2005/12/19 15:48:00 rocket Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -353,6 +353,7 @@ if __name__ == "__main__":
                print "\nCatalyst build aborted due to user interrupt ( Ctrl-C )"
                print
                print "Catalyst aborting...."
+               sys.exit(2)
        except LockInUse:
                print "Catalyst aborting...."
                sys.exit(2)