summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-20 04:06:46 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-20 04:06:46 +0000
commit5ed90695c081f4fa5fde2873be3c16aa6bd4c569 (patch)
tree50a7cda7601d6a3521dd9687fc7e6f8469383472
parentcfc7ab00ea2309ddbca5949a42d433011f3651a6 (diff)
downloadportage-5ed90695c081f4fa5fde2873be3c16aa6bd4c569.tar.gz
portage-5ed90695c081f4fa5fde2873be3c16aa6bd4c569.tar.bz2
portage-5ed90695c081f4fa5fde2873be3c16aa6bd4c569.zip
When a config instance is cloned, don't set default USE_ORDER since it would have been done already for the instance being cloned.
svn path=/main/trunk/; revision=3955
-rw-r--r--pym/portage.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py
index caca14e39..cb78ff4ee 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1187,19 +1187,16 @@ class config:
else:
self.pprovideddict[mycatpkg]=[x]
- self.lookuplist=self.configlist[:]
- self.lookuplist.reverse()
-
- useorder=self["USE_ORDER"]
- if not useorder:
# reasonable defaults; this is important as without USE_ORDER,
# USE will always be "" (nothing set)!
- useorder = "env:pkg:conf:defaults"
- self.backupenv["USE_ORDER"] = useorder
- useordersplit=useorder.split(":")
+ if "USE_ORDER" not in self:
+ self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults"
+
+ self.lookuplist=self.configlist[:]
+ self.lookuplist.reverse()
self.uvlist=[]
- for x in useordersplit:
+ for x in self["USE_ORDER"].split(":"):
if self.configdict.has_key(x):
if "PKGUSE" in self.configdict[x].keys():
del self.configdict[x]["PKGUSE"] # Delete PkgUse, Not legal to set.