diff options
| -rwxr-xr-x | bin/emerge | 4 | ||||
| -rwxr-xr-x | bin/repoman | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 21730fe3e..46c7356bb 100755 --- a/bin/emerge +++ b/bin/emerge @@ -452,9 +452,7 @@ def emergelog(mystr,short_msg=None): mylogfile.flush() portage_locks.unlockfile(l) mylogfile.close() - except SystemExit, e: - raise # Needed else can't exit - except Exception, e: + except (IOError,OSError,portage_exception.PortageException), e: if edebug: print "emergelog():",e pass diff --git a/bin/repoman b/bin/repoman index 54a1da79e..f28c8e373 100755 --- a/bin/repoman +++ b/bin/repoman @@ -564,6 +564,10 @@ try: uselist=portage.grabfile(portdir+"/profiles/use.desc") for l in range(0,len(uselist)): uselist[l]=string.split(uselist[l])[0] + for var in string.split(repoman_settings["USE_EXPAND"]): + vardescs = portage.grabfile(portdir+"/profiles/"+var.lower()+".desc") + for l in range(0, len(vardescs)): + uselist.append(var.lower() + "_" + string.split(vardescs[l])[0]) except SystemExit, e: raise # Need to propogate this except: |