From 2b82c7bc6efe5a8ad4f86c7cfdf9906e3f10131b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 2 Jul 2006 08:07:59 +0000 Subject: Add support for arch.list in overlays (bug #137975). svn path=/main/trunk/; revision=3752 --- bin/repoman | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'bin/repoman') 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: -- cgit v1.2.3-1-g7c22