diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-08-29 19:58:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-08-29 19:58:18 +0000 |
| commit | b2108d58eb2fe043cce935607b7b235c787a83aa (patch) | |
| tree | f762af4b2dd2cb19d8e1b1b110216a248be78dad /pym | |
| parent | 9d70a5008031228c2b26988d1b572c2a8f6729ee (diff) | |
| download | portage-b2108d58eb2fe043cce935607b7b235c787a83aa.tar.gz portage-b2108d58eb2fe043cce935607b7b235c787a83aa.tar.bz2 portage-b2108d58eb2fe043cce935607b7b235c787a83aa.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |