repoman: fix dep check for * and ~* keywords
authorZac Medico <zmedico@gentoo.org>
Sun, 16 Dec 2012 08:56:26 +0000 (00:56 -0800)
committerZac Medico <zmedico@gentoo.org>
Sun, 16 Dec 2012 08:56:26 +0000 (00:56 -0800)
We want the effective ACCEPT_KEYWORDS to correspond to the current
profile's arch (rather than using wildcards).

bin/repoman

index 60792d7e5ee35df242b9a8aeebf7403bd0a44558..fb2a9ad2c911a0e40f1f18072056474ee50dfa8b 100755 (executable)
@@ -1891,7 +1891,8 @@ for x in effective_scanlist:
                                                for expanded_arch in profiles:
                                                        if expanded_arch == "**":
                                                                continue
-                                                       arches.add((keyword, expanded_arch, (arch, keyword)))
+                                                       arches.add((keyword, expanded_arch,
+                                                               (expanded_arch, "~" + expanded_arch)))
                                        else:
                                                arches.add((keyword, arch, (arch, keyword)))
                                else:
@@ -1899,7 +1900,8 @@ for x in effective_scanlist:
                                                for expanded_arch in profiles:
                                                        if expanded_arch == "**":
                                                                continue
-                                                       arches.add((keyword, expanded_arch, (keyword,)))
+                                                       arches.add((keyword, expanded_arch,
+                                                               (expanded_arch,)))
                                        else:
                                                arches.add((keyword, keyword, (keyword,)))
                        if not arches: