From e93d23d54a9977b2003edda9340faaa1e8b5dfdf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Jun 2006 03:12:05 +0000 Subject: 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 --- pym/portage.py | 10 +++++++--- 1 file 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( -- cgit v1.2.3-1-g7c22