From 4fed6bdf7360b3f9d3ea4832973c398aa387f0a8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 26 Aug 2010 14:49:34 -0700 Subject: Ensure SystemExit is never caught. --- pym/portage/cache/sql_template.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pym/portage/cache') diff --git a/pym/portage/cache/sql_template.py b/pym/portage/cache/sql_template.py index d3c6a0b30..d023b1b5d 100644 --- a/pym/portage/cache/sql_template.py +++ b/pym/portage/cache/sql_template.py @@ -129,6 +129,8 @@ class SQLDatabase(template.database): raise cache_errors.CacheCorruption(self, cpv, e) if self.con.rowcount <= 0: raise KeyError(cpv) + except SystemExit: + raise except Exception: if not self.autocommits: self.db.rollback() @@ -166,6 +168,8 @@ class SQLDatabase(template.database): if self.autocommits: self.commit() + except SystemExit: + raise except Exception: if not self.autocommits: try: -- cgit v1.2.3-1-g7c22