summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-17 20:55:45 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-17 20:55:45 +0000
commitbce8661dde76cad0be512dcc58827c35e16fb336 (patch)
tree65334fcbd0ed5a50eeca6a9c10278b9a798bc7ab
parenta25ac756208465da66050aabfd3b2e2bd39f3f48 (diff)
downloadportage-bce8661dde76cad0be512dcc58827c35e16fb336.tar.gz
portage-bce8661dde76cad0be512dcc58827c35e16fb336.tar.bz2
portage-bce8661dde76cad0be512dcc58827c35e16fb336.zip
Fix repoman to grab categores, arch.list, and package.mask from the proper locations when scanning an overlay. Thanks to mcummings for reporting.
svn path=/main/trunk/; revision=3368
-rw-r--r--pym/portage.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py
index fbf92191b..2a3ec7baa 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1130,12 +1130,10 @@ class config:
self.lookuplist=self.configlist[:]
self.lookuplist.reverse()
- if os.environ.get("PORTAGE_CALLER","") == "repoman":
+ if os.environ.get("PORTAGE_CALLER","") == "repoman" and \
+ os.environ.get("PORTDIR_OVERLAY","") == "":
# repoman shouldn't use local settings.
locations = [self["PORTDIR"] + "/profiles"]
- self.pusedict = {}
- self.pkeywordsdict = {}
- self.punmaskdict = {}
else:
abs_user_config = os.path.join(config_root,
USER_CONFIG_PATH.lstrip(os.path.sep))
@@ -1146,6 +1144,11 @@ class config:
if os.path.isdir(ov+"/profiles"):
locations.append(ov+"/profiles")
+ if os.environ.get("PORTAGE_CALLER","") == "repoman":
+ self.pusedict = {}
+ self.pkeywordsdict = {}
+ self.punmaskdict = {}
+ else:
pusedict = grabdict_package(
os.path.join(abs_user_config, "package.use"), recursive=1)
self.pusedict = {}