From d640dcfb45fcc799e3e29f70a0c7fcaeabd8c46f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 24 Apr 2006 10:29:32 +0000 Subject: Remove a possibly unecessary try statement that may swallow important exceptions. svn path=/main/trunk/; revision=3209 --- pym/portage.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index d6dbde430..1731182e0 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2278,15 +2278,10 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, t mysettings["PORTAGE_QUIET"] = "1" if mydo != "depend": - try: - mysettings["INHERITED"], mysettings["RESTRICT"] = db[root][tree].dbapi.aux_get( \ - mycpv,["INHERITED","RESTRICT"]) - mysettings["PORTAGE_RESTRICT"]=string.join(flatten(portage_dep.use_reduce(portage_dep.paren_reduce( \ - mysettings["RESTRICT"]), uselist=mysettings["USE"].split())),' ') - except SystemExit, e: - raise - except: - pass + mysettings["INHERITED"], mysettings["RESTRICT"] = db[root][tree].dbapi.aux_get( \ + mycpv,["INHERITED","RESTRICT"]) + mysettings["PORTAGE_RESTRICT"]=string.join(flatten(portage_dep.use_reduce(portage_dep.paren_reduce( \ + mysettings["RESTRICT"]), uselist=mysettings["USE"].split())),' ') eapi = db[root][tree].dbapi.aux_get(mycpv, ["EAPI"])[0] if not eapi_is_supported(eapi): # can't do anything with this. -- cgit v1.2.3-1-g7c22