summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-17 02:47:09 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-17 02:47:09 +0000
commitf818faf7b7fd4f9dc5794e35e2515c95b011cc3e (patch)
treedf2fb18e83ae8ce25a68d96367de96773f2abf9e
parentfc85596f4af4c5d171ebac5368405ac9b1ed477d (diff)
downloadportage-f818faf7b7fd4f9dc5794e35e2515c95b011cc3e.tar.gz
portage-f818faf7b7fd4f9dc5794e35e2515c95b011cc3e.tar.bz2
portage-f818faf7b7fd4f9dc5794e35e2515c95b011cc3e.zip
Fix broken exception handling.
svn path=/main/trunk/; revision=6223
-rw-r--r--pym/portage/tests/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
index 7d13af1e6..bef41ef03 100644
--- a/pym/portage/tests/__init__.py
+++ b/pym/portage/tests/__init__.py
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import os, unittest, time
+import os, sys, time, unittest
import portage.tests
def main():
@@ -110,10 +110,10 @@ class TestCase(unittest.TestCase):
result.addTodo(self,"%s: TODO" % testMethod)
else:
result.addFailure(self, self._exc_info())
- except KeyboardInterrupt:
+ except (KeyboardInterrupt, SystemExit):
raise
except:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
try:
self.tearDown()
except KeyboardInterrupt: