summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-16 00:56:26 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-16 00:56:26 -0800
commitbcb28cd73e74d3d45376ab517ea219979b79eeed (patch)
tree3df9b731e1220eeed185cb50c003c4bd10a9b202 /bin
parent37044b4493e8de520c7b394f5d7c43c26b9b064b (diff)
downloadportage-bcb28cd73e74d3d45376ab517ea219979b79eeed.tar.gz
portage-bcb28cd73e74d3d45376ab517ea219979b79eeed.tar.bz2
portage-bcb28cd73e74d3d45376ab517ea219979b79eeed.zip
repoman: fix dep check for * and ~* keywords
We want the effective ACCEPT_KEYWORDS to correspond to the current profile's arch (rather than using wildcards).
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 60792d7e5..fb2a9ad2c 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -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: