From: Alec Warner <antarus@gentoo.org>
Date: Mon, 3 Apr 2006 02:17:48 +0000 (-0000)
Subject: Make repoman check for USE expand descriptions in other files so USE_EXPAND variables... 
X-Git-Tag: v2.1_pre8~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ef7b0e3c752da680f96daafd074c34097057a53;p=portage.git

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
---

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: