diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-11 19:07:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-11 19:07:25 +0000 |
| commit | 8773ae09606fbc8bdb04abaf62b66cec2eb18d4c (patch) | |
| tree | e19f4f5a4ce392667746a233fa04816b97c57b0e /pym/portage.py | |
| parent | 3d47b3670efb1a0e9de20cbca4bb68a2def9c70c (diff) | |
| download | portage-8773ae09606fbc8bdb04abaf62b66cec2eb18d4c.tar.gz portage-8773ae09606fbc8bdb04abaf62b66cec2eb18d4c.tar.bz2 portage-8773ae09606fbc8bdb04abaf62b66cec2eb18d4c.zip | |
Remove all calls to config.load_infodir() since it doesn't seem
to server any purpose now that the complete environment is loaded
from environment.bz2. (trunk r9833:9835)
svn path=/main/branches/2.1.2/; revision=9836
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py index 082655930..d54bc973c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4787,12 +4787,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, return spawn(_shell_quote(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( _shell_quote(ebuild_sh_binary) + " " + mydo, mysettings, debug=debug, free=1, logfile=logfile) @@ -4849,7 +4843,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, noiselevel=-1) return phase_retval elif mydo in ("prerm", "postrm", "config", "info"): - mysettings.load_infodir(mysettings["O"]) retval = spawn( _shell_quote(ebuild_sh_binary) + " " + mydo, mysettings, debug=debug, free=1, logfile=logfile) |