| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-11 19:07:25 +0000 (Fri, 11 Apr 2008) |
| 3 |
New Revision: 9836 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage.py |
| 7 |
Log: |
| 8 |
Remove all calls to config.load_infodir() since it doesn't seem |
| 9 |
to server any purpose now that the complete environment is loaded |
| 10 |
from environment.bz2. (trunk r9833:9835) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/pym/portage.py |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/pym/portage.py 2008-04-11 19:03:54 UTC (rev 9835) |
| 16 |
+++ main/branches/2.1.2/pym/portage.py 2008-04-11 19:07:25 UTC (rev 9836) |
| 17 |
@@ -4787,12 +4787,6 @@ |
| 18 |
return spawn(_shell_quote(ebuild_sh_binary) + " " + mydo, |
| 19 |
mysettings, debug=debug, free=1, logfile=logfile) |
| 20 |
elif mydo == "setup": |
| 21 |
- infodir = os.path.join( |
| 22 |
- mysettings["PORTAGE_BUILDDIR"], "build-info") |
| 23 |
- if os.path.isdir(infodir): |
| 24 |
- """Load USE flags for setup phase of a binary package. |
| 25 |
- Ideally, the environment.bz2 would be used instead.""" |
| 26 |
- mysettings.load_infodir(infodir) |
| 27 |
retval = spawn( |
| 28 |
_shell_quote(ebuild_sh_binary) + " " + mydo, mysettings, |
| 29 |
debug=debug, free=1, logfile=logfile) |
| 30 |
@@ -4849,7 +4843,6 @@ |
| 31 |
noiselevel=-1) |
| 32 |
return phase_retval |
| 33 |
elif mydo in ("prerm", "postrm", "config", "info"): |
| 34 |
- mysettings.load_infodir(mysettings["O"]) |
| 35 |
retval = spawn( |
| 36 |
_shell_quote(ebuild_sh_binary) + " " + mydo, |
| 37 |
mysettings, debug=debug, free=1, logfile=logfile) |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives