From 8773ae09606fbc8bdb04abaf62b66cec2eb18d4c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Apr 2008 19:07:25 +0000 Subject: [PATCH] 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 --- pym/portage.py | 7 ------- 1 file changed, 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) -- 2.26.2