When a config instance is cloned, don't set default USE_ORDER since it would have...
authorZac Medico <zmedico@gentoo.org>
Thu, 20 Jul 2006 04:06:46 +0000 (04:06 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 20 Jul 2006 04:06:46 +0000 (04:06 -0000)
svn path=/main/trunk/; revision=3955

pym/portage.py

index caca14e39a55b4c405fa99828e0d22a12eb035b9..cb78ff4ee14c1501f13c444f6e9f4d7e156b33f0 100644 (file)
@@ -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.