From: Alec Warner <antarus@gentoo.org>
Date: Sun, 2 Apr 2006 00:12:34 +0000 (-0000)
Subject: Fixing stupid exception handling
X-Git-Tag: v2.1_pre8~48
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=28a73812f2a1553f52bb1b72d0e7b6edbc0fd4c3;p=portage.git

Fixing stupid exception handling

svn path=/main/trunk/; revision=3051
---

diff --git a/bin/emerge b/bin/emerge
index bb310f126..21730fe3e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -154,9 +154,7 @@ def sorted_versions(verlist):
 if portage.settings.has_key("PORTAGE_NICENESS"):
 	try:
 		os.nice(int(portage.settings["PORTAGE_NICENESS"]))
-	except SystemExit, e:
-		raise # Needed else can't exit
-	except Exception,e:
+	except (OSError,ValueError), e:
 		print "!!! Failed to change nice value to '"+str(portage.settings["PORTAGE_NICENESS"])+"'"
 		print "!!!",e