For bug #179870, correctly handle slot deps in the profile's package.* files. (trunk...

svn path=/main/branches/2.1.2/; revision=6666

diff --git a/pym/portage.py b/pym/portage.py
index 7c4fa43e9a15ea61841939c1a27b22bb8120a9c2..83edfeaa967199219a5c6c9fe455fad9a70b8229 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1677,11 +1677,13 @@ class config:
                has_changed = False
                self.mycpv = mycpv
                cp = dep_getkey(mycpv)
+               cpv_slot = self.mycpv
                pkginternaluse = ""
                if mydb:
-                       pkginternaluse = " ".join([x[1:] \
-                               for x in mydb.aux_get(mycpv, ["IUSE"])[0].split() \
-                               if x.startswith("+")])
+                       slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"])
+                       cpv_slot = "%s:%s" % (self.mycpv, slot)
+                       pkginternaluse = [x[1:] for x in iuse.split() if x.startswith("+")]
+                       pkginternaluse = " ".join(pkginternaluse)
                if pkginternaluse != self.configdict["pkginternal"].get("USE", ""):
                        self.configdict["pkginternal"]["USE"] = pkginternaluse
                        has_changed = True
@@ -1690,7 +1692,7 @@ class config:
                        defaults.append(self.make_defaults_use[i])
                        cpdict = self.pkgprofileuse[i].get(cp, None)
                        if cpdict:
-                               best_match = best_match_to_list(self.mycpv, cpdict.keys())
+                               best_match = best_match_to_list(cpv_slot, cpdict.keys())
                                if best_match:
                                        defaults.append(cpdict[best_match])
                defaults = " ".join(defaults)
@@ -1702,7 +1704,7 @@ class config:
                        useforce.append(self.useforce_list[i])
                        cpdict = self.puseforce_list[i].get(cp, None)
                        if cpdict:
-                               best_match = best_match_to_list(self.mycpv, cpdict.keys())
+                               best_match = best_match_to_list(cpv_slot, cpdict.keys())
                                if best_match:
                                        useforce.append(cpdict[best_match])
                useforce = set(stack_lists(useforce, incremental=True))
@@ -1714,7 +1716,7 @@ class config:
                        usemask.append(self.usemask_list[i])
                        cpdict = self.pusemask_list[i].get(cp, None)
                        if cpdict:
-                               best_match = best_match_to_list(self.mycpv, cpdict.keys())
+                               best_match = best_match_to_list(cpv_slot, cpdict.keys())
                                if best_match:
                                        usemask.append(cpdict[best_match])
                usemask = set(stack_lists(usemask, incremental=True))
@@ -1723,13 +1725,11 @@ class config:
                        has_changed = True
                oldpuse = self.puse
                self.puse = ""
-               if self.pusedict.has_key(cp):
-                       cpv_slot = self.mycpv
-                       if mydb:
-                               cpv_slot += ":" + mydb.aux_get(self.mycpv, ["SLOT"])[0]
-                       self.pusekey = best_match_to_list(cpv_slot, self.pusedict[cp].keys())
+               cpdict = self.pusedict.get(cp)
+               if cpdict:
+                       self.pusekey = best_match_to_list(cpv_slot, cpdict.keys())
                        if self.pusekey:
-                               self.puse = " ".join(self.pusedict[cp][self.pusekey])
+                               self.puse = " ".join(cpdict[self.pusekey])
                if oldpuse != self.puse:
                        has_changed = True
                self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file