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

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

diff --git a/pym/portage.py b/pym/portage.py
index 86a998c64988a8ded0a59868f43a5eaa1fa43732..2882faacd2db580e6b9f2613be9ca6e67466a6b4 100644 (file)
--- 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: