From: Arfrever Frehtes Taifersar Arahesis Date: Tue, 23 Jul 2013 20:07:42 +0000 (+0200) Subject: portage.package.ebuild.getmaskingreason.getmaskingreason(): Stop using PORTDIR and... X-Git-Tag: v2.2.0_alpha189~22 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82db881fdfbe8893cb84625a2e9783d154ae5910;p=portage.git portage.package.ebuild.getmaskingreason.getmaskingreason(): Stop using PORTDIR and PORTDIR_OVERLAY. --- diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py index 1c167140e..53895749a 100644 --- a/pym/portage/package/ebuild/getmaskingreason.py +++ b/pym/portage/package/ebuild/getmaskingreason.py @@ -68,13 +68,10 @@ def getmaskingreason(mycpv, metadata=None, settings=None, mycp = pkg.cp - # XXX- This is a temporary duplicate of code from the config constructor. - locations = [os.path.join(settings["PORTDIR"], "profiles")] + locations = [] + for repo in settings.repositories[pkg.repo].masters + (settings.repositories[pkg.repo],): + locations.append(os.path.join(repo.location, "profiles")) locations.extend(settings.profiles) - for ov in portage.util.shlex_split(settings["PORTDIR_OVERLAY"]): - 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)) locations.reverse()