summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-18 03:12:05 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-18 03:12:05 +0000
commite93d23d54a9977b2003edda9340faaa1e8b5dfdf (patch)
treede2b3650b3c50f56dac5f240611d81a75280e68d
parentdc7558f83b01170c106d36e6ea5feeacfe87baf5 (diff)
downloadportage-e93d23d54a9977b2003edda9340faaa1e8b5dfdf.tar.gz
portage-e93d23d54a9977b2003edda9340faaa1e8b5dfdf.tar.bz2
portage-e93d23d54a9977b2003edda9340faaa1e8b5dfdf.zip
Prevent repoman frm using /etc/portage/package.mask. This is a regression in 2.1.1_pre1 from svn r3495. See bug #133740. Thanks to sekretarz for reporting this issue.
svn path=/main/trunk/; revision=3527
-rw-r--r--pym/portage.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 70e7c6733..8503ec198 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1146,6 +1146,9 @@ class config:
self.lookuplist=self.configlist[:]
self.lookuplist.reverse()
+ pmask_locations = [os.path.join(self["PORTDIR"], "profiles")]
+ pmask_locations.extend(self.profiles)
+
if os.environ.get("PORTAGE_CALLER","") == "repoman" and \
os.environ.get("PORTDIR_OVERLAY","") == "":
# repoman shouldn't use local settings.
@@ -1163,6 +1166,10 @@ class config:
if os.path.isdir(profiles_dir):
overlay_profiles.append(profiles_dir)
locations += overlay_profiles
+
+ pmask_locations.extend(overlay_profiles)
+ if os.environ.get("PORTAGE_CALLER","") != "repoman":
+ pmask_locations.append(abs_user_config)
if os.environ.get("PORTAGE_CALLER","") == "repoman":
self.pusedict = {}
@@ -1222,9 +1229,6 @@ class config:
self.configdict["conf"]["PORTAGE_ARCHLIST"] = " ".join(archlist)
#package.mask
- pmask_locations = [os.path.join(self["PORTDIR"], "profiles")] + \
- self.profiles + overlay_profiles + \
- [os.path.join(config_root, USER_CONFIG_PATH.lstrip(os.path.sep))]
pkgmasklines = []
for x in pmask_locations:
pkgmasklines.append(grabfile_package(