summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-04-03 02:17:48 +0000
committerAlec Warner <antarus@gentoo.org>2006-04-03 02:17:48 +0000
commit4ef7b0e3c752da680f96daafd074c34097057a53 (patch)
treed7dca9bb3e13d7ea3ed6a31cf7d3c4389a0d996a
parenta6ae48f2f18689b2cb5d6a65be31f72ea8c765fb (diff)
downloadportage-4ef7b0e3c752da680f96daafd074c34097057a53.tar.gz
portage-4ef7b0e3c752da680f96daafd074c34097057a53.tar.bz2
portage-4ef7b0e3c752da680f96daafd074c34097057a53.zip
Make repoman check for USE expand descriptions in other files so USE_EXPAND variables can have longer/better/faster/stronger descriptions.
svn path=/main/trunk/; revision=3056
-rwxr-xr-xbin/emerge4
-rwxr-xr-xbin/repoman4
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: