Before the preinst phase, only call load_infodir for binary packages. Otherwise...

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

diff --git a/pym/portage.py b/pym/portage.py
index f37337782a09357d1373180e7a350ed485820914..e8bb3e5ffa6947503bc4393f9983e1e311913943 100644 (file)
--- 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: