1 |
Author: zmedico |
2 |
Date: 2008-04-11 19:01:45 +0000 (Fri, 11 Apr 2008) |
3 |
New Revision: 9834 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/__init__.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. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/portage/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/portage/__init__.py 2008-04-11 18:48:33 UTC (rev 9833) |
16 |
+++ main/trunk/pym/portage/__init__.py 2008-04-11 19:01:45 UTC (rev 9834) |
17 |
@@ -4788,10 +4788,6 @@ |
18 |
elif mydo == "setup": |
19 |
infodir = os.path.join( |
20 |
mysettings["PORTAGE_BUILDDIR"], "build-info") |
21 |
- if os.path.isdir(infodir): |
22 |
- """Load USE flags for setup phase of a binary package. |
23 |
- Ideally, the environment.bz2 would be used instead.""" |
24 |
- mysettings.load_infodir(infodir) |
25 |
retval = spawn( |
26 |
_shell_quote(ebuild_sh_binary) + " " + mydo, mysettings, |
27 |
debug=debug, free=1, logfile=logfile) |
28 |
@@ -4848,7 +4844,6 @@ |
29 |
noiselevel=-1) |
30 |
return phase_retval |
31 |
elif mydo in ("prerm", "postrm", "config", "info"): |
32 |
- mysettings.load_infodir(mysettings["O"]) |
33 |
retval = spawn( |
34 |
_shell_quote(ebuild_sh_binary) + " " + mydo, |
35 |
mysettings, debug=debug, free=1, logfile=logfile) |
36 |
|
37 |
-- |
38 |
gentoo-commits@l.g.o mailing list |