From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 30 Dec 2006 20:15:35 +0000 (-0000)
Subject: Correct the package.mask lookup order in getmaskingreason().
X-Git-Tag: v2.1.2~185
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cc3ca52718e0f15a2d0a3f3360977e3b33041db9;p=portage.git

Correct the package.mask lookup order in getmaskingreason().

svn path=/main/trunk/; revision=5429
---

diff --git a/pym/portage.py b/pym/portage.py
index 18e8ef51b..06dcd2f83 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4308,14 +4308,14 @@ def getmaskingreason(mycpv, settings=None, portdb=None):
 	mycp=mysplit[0]+"/"+mysplit[1]
 
 	# XXX- This is a temporary duplicate of code from the config constructor.
-	locations = settings.profiles[:]
-	locations.append(os.path.join(settings["PORTDIR"], "profiles"))
-	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
-		USER_CONFIG_PATH.lstrip(os.path.sep)))
+	locations = [os.path.join(settings["PORTDIR"], "profiles")]
+	locations.extend(settings.profiles)
 	for ov in settings["PORTDIR_OVERLAY"].split():
 		profdir = os.path.join(normalize_path(ov), "profiles")
 		if os.path.isdir(profdir):
 			locations.append(profdir)
+	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
+		USER_CONFIG_PATH.lstrip(os.path.sep)))
 	locations.reverse()
 	pmasklists = [grablines(os.path.join(x, "package.mask"), recursive=1) for x in locations]
 	pmasklines = []