From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 29 Aug 2006 19:58:18 +0000 (-0000)
Subject: Before the preinst phase, only call load_infodir for binary packages.  Otherwise... 
X-Git-Tag: v2.1.1~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2108d58eb2fe043cce935607b7b235c787a83aa;p=portage.git

Before the preinst phase, only call load_infodir for binary packages.  Otherwise, load_infodir will wipe settings from doebuild_environment (such as CATEGORY).

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

diff --git a/pym/portage.py b/pym/portage.py
index f37337782..e8bb3e5ff 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2828,8 +2828,8 @@ 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 == "preinst":
-			mysettings.load_infodir(mysettings["O"])
 			if mysettings.get("EMERGE_FROM", None) == "binary":
+				mysettings.load_infodir(mysettings["O"])
 				mysettings["IMAGE"] = os.path.join(
 					mysettings["PKG_TMPDIR"], mysettings["PF"], "bin")
 			else: