1 |
Author: zmedico |
2 |
Date: 2009-04-30 04:35:53 +0000 (Thu, 30 Apr 2009) |
3 |
New Revision: 13415 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/__init__.py |
7 |
Log: |
8 |
Exclude 'backupenv' from config.configlist and lookuplist since it doesn't |
9 |
make size to have it in there when configdict['env'] already serves that |
10 |
purpose. This allows values to be temporarily removed from configdict['env'] |
11 |
and have them not appear in the environment until reset() is called to restore |
12 |
those values from the backupenv. |
13 |
|
14 |
|
15 |
Modified: main/trunk/pym/portage/__init__.py |
16 |
=================================================================== |
17 |
--- main/trunk/pym/portage/__init__.py 2009-04-29 20:08:27 UTC (rev 13414) |
18 |
+++ main/trunk/pym/portage/__init__.py 2009-04-30 04:35:53 UTC (rev 13415) |
19 |
@@ -1257,19 +1257,19 @@ |
20 |
self.mycpv = copy.deepcopy(clone.mycpv) |
21 |
self._setcpv_args_hash = copy.deepcopy(clone._setcpv_args_hash) |
22 |
|
23 |
- self.configlist = copy.deepcopy(clone.configlist) |
24 |
+ self.configdict = copy.deepcopy(clone.configdict) |
25 |
+ self.configlist = [ |
26 |
+ self.configdict['env.d'], |
27 |
+ self.configdict['pkginternal'], |
28 |
+ self.configdict['globals'], |
29 |
+ self.configdict['defaults'], |
30 |
+ self.configdict['conf'], |
31 |
+ self.configdict['pkg'], |
32 |
+ self.configdict['auto'], |
33 |
+ self.configdict['env'], |
34 |
+ ] |
35 |
self.lookuplist = self.configlist[:] |
36 |
self.lookuplist.reverse() |
37 |
- self.configdict = { |
38 |
- "env.d": self.configlist[0], |
39 |
- "pkginternal": self.configlist[1], |
40 |
- "globals": self.configlist[2], |
41 |
- "defaults": self.configlist[3], |
42 |
- "conf": self.configlist[4], |
43 |
- "pkg": self.configlist[5], |
44 |
- "auto": self.configlist[6], |
45 |
- "backupenv": self.configlist[7], |
46 |
- "env": self.configlist[8] } |
47 |
self._use_expand_dict = copy.deepcopy(clone._use_expand_dict) |
48 |
self.profiles = copy.deepcopy(clone.profiles) |
49 |
self.backupenv = self.configdict["backupenv"] |
50 |
@@ -1579,8 +1579,7 @@ |
51 |
self.configlist.append({}) |
52 |
self.configdict["auto"]=self.configlist[-1] |
53 |
|
54 |
- self.configlist.append(self.backupenv) # XXX Why though? |
55 |
- self.configdict["backupenv"]=self.configlist[-1] |
56 |
+ self.configdict["backupenv"] = self.backupenv |
57 |
|
58 |
# Don't allow the user to override certain variables in the env |
59 |
for k in profile_only_variables: |