From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 22 Oct 2006 03:29:44 +0000 (-0000)
Subject: Call load_infodir before the setup phase for binary packages so that USE is properly... 
X-Git-Tag: v2.1.2~575
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7201e000ed51eeb02af62e642f400511053764ba;p=portage.git

Call load_infodir before the setup phase for binary packages so that USE is properly set.

svn path=/main/trunk/; revision=4789
---

diff --git a/pym/portage.py b/pym/portage.py
index 86a998c64..2882faacd 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2954,6 +2954,12 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			return spawn(EBUILD_SH_BINARY + " " + mydo, mysettings,
 				debug=debug, free=1, logfile=logfile)
 		elif mydo == "setup":
+			infodir = os.path.join(
+				mysettings["PORTAGE_BUILDDIR"], "build-info")
+			if os.path.isdir(infodir):
+				"""Load USE flags for setup phase of a binary package.
+				Ideally, the environment.bz2 would be used instead."""
+				mysettings.load_infodir(infodir)
 			retval = spawn(EBUILD_SH_BINARY + " " + mydo, mysettings,
 				debug=debug, free=1, logfile=logfile)
 			if secpass >= 2: