Make repoman check for USE expand descriptions in other files so USE_EXPAND variables...

svn path=/main/trunk/; revision=3056

diff --git a/bin/emerge b/bin/emerge
index 21730fe3ebb6b6765b868f81f8653f76e6a236bd..46c7356bb690cc6db00f88939cd05aea20066be4 100755 (executable)
--- 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 54a1da79e4db3feb175995c72e9c0b1c514a0eb1..f28c8e373e8da71e61ef572fdcbd7bd18893162c 100755 (executable)
--- 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: