Add support for arch.list in overlays (bug #137975).

svn path=/main/trunk/; revision=3752

diff --git a/bin/repoman b/bin/repoman
index 2342b1dab3a3c3cc771dd285fe23f395abf08cf1..5508373fb984f43317b2605db274b1d5f141a04f 100755 (executable)
--- 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: