summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-25 10:37:56 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-25 10:37:56 +0000
commit4a666b4e9bf3978ddcf64efe6f0829bfb276bf24 (patch)
tree136e47e6eefb66a52f62b8b09643f81c6b76f640
parent- trim extraneous spaces tabs form feeds and newlines (diff)
downloadportage-multirepo-4a666b4e9bf3978ddcf64efe6f0829bfb276bf24.tar.gz
portage-multirepo-4a666b4e9bf3978ddcf64efe6f0829bfb276bf24.tar.bz2
portage-multirepo-4a666b4e9bf3978ddcf64efe6f0829bfb276bf24.zip
Allow overlays and the user profile to extend arch.list.
svn path=/main/trunk/; revision=2468
-rw-r--r--pym/portage.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 57e266f2..24d1ded5 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1101,9 +1101,6 @@ class config:
self.lookuplist=self.configlist[:]
self.lookuplist.reverse()
- archlist = grabfile(self["PORTDIR"]+"/profiles/arch.list")
- self.configdict["conf"]["PORTAGE_ARCHLIST"] = string.join(archlist)
-
if os.environ.get("PORTAGE_CALLER","") == "repoman":
# repoman shouldn't use local settings.
locations = [self["PORTDIR"] + "/profiles"]
@@ -1160,6 +1157,10 @@ class config:
self.categories = stack_lists(categories, incremental=1)
del categories
+ archlist = grab_multiple("arch.list", locations, grabfile)
+ archlist = stack_lists(archlist, incremental=1)
+ self.configdict["conf"]["PORTAGE_ARCHLIST"] = " ".join(archlist)
+
# get virtuals -- needs categories
self.loadVirtuals('/')
@@ -6903,10 +6904,9 @@ if not os.path.isdir(settings["PORTAGE_TMPDIR"]):
# COMPATABILITY -- This shouldn't be used.
pkglines = settings.packages
-groups=settings["ACCEPT_KEYWORDS"].split()
-archlist=[]
-for myarch in grabfile(settings["PORTDIR"]+"/profiles/arch.list"):
- archlist += [myarch,"~"+myarch]
+groups = settings["ACCEPT_KEYWORDS"].split()
+archlist = flatten([[myarch, "~"+myarch] for myarch in settings["PORTAGE_ARCHLIST"].split()])
+
for group in groups:
if not archlist:
writemsg("--- 'profiles/arch.list' is empty or not available. Empty portage tree?\n")