[patch] portage-stack-etc-last.patch

portage-stack-etc-last.patch (text/plain), 1.35 KB, created by Ed Catmur on 2006-05-18 18:09:11 UTC

--- portage.py	2006/05/19 01:02:32	1.1
+++ portage.py	2006/05/19 01:04:33
@@ -1137,12 +1137,12 @@ class config:
 			else:
 				abs_user_config = os.path.join(config_root,
 					USER_CONFIG_PATH.lstrip(os.path.sep))
-				locations = [os.path.join(self["PORTDIR"], "profiles"),
-					abs_user_config]
+				locations = [os.path.join(self["PORTDIR"], "profiles")]
 				for ov in self["PORTDIR_OVERLAY"].split():
 					ov = os.path.normpath(ov)
 					if os.path.isdir(ov+"/profiles"):
 						locations.append(ov+"/profiles")
+				locations.append(abs_user_config)
 
 			if os.environ.get("PORTAGE_CALLER","") == "repoman":
 				self.pusedict = {}
@@ -3571,12 +3571,12 @@ def getmaskingreason(mycpv):
 	# 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)))
 	for ov in settings["PORTDIR_OVERLAY"].split():
 		profdir = os.path.join(os.path.normpath(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 = []