summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-02 08:07:59 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-02 08:07:59 +0000
commit2b82c7bc6efe5a8ad4f86c7cfdf9906e3f10131b (patch)
treea5bd9bfede39ade38f7c04062849911ebb608480
parentff7273fea9c25093edff5258e3154e118d2d9e4a (diff)
downloadportage-2b82c7bc6efe5a8ad4f86c7cfdf9906e3f10131b.tar.gz
portage-2b82c7bc6efe5a8ad4f86c7cfdf9906e3f10131b.tar.bz2
portage-2b82c7bc6efe5a8ad4f86c7cfdf9906e3f10131b.zip
Add support for arch.list in overlays (bug #137975).
svn path=/main/trunk/; revision=3752
-rwxr-xr-xbin/repoman13
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/repoman b/bin/repoman
index 2342b1dab..5508373fb 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -588,14 +588,13 @@ if portdir_overlay != portdir:
liclist.update(portage.listdir(os.path.join(portdir_overlay, "licenses")))
# retrieve list of offical keywords
-try:
- kwlist=portage.grabfile(portdir+"/profiles/arch.list")
-except SystemExit, e:
- raise # Need to propogate this
-except:
- err("Couldn't read KEYWORDS from arch.list")
+kwlist = set(portage.grabfile(os.path.join(portdir, "profiles", "arch.list")))
if not kwlist:
- kwlist=["alpha","arm","hppa","mips","ppc","sparc","x86"]
+ err("Couldn't read KEYWORDS from arch.list")
+
+if portdir_overlay != portdir:
+ kwlist.update(portage.grabfile(
+ os.path.join(portdir_overlay, "profiles", "arch.list")))
scanlist=[]
if repolevel==2: