diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-30 20:15:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-30 20:15:35 +0000 |
| commit | cc3ca52718e0f15a2d0a3f3360977e3b33041db9 (patch) | |
| tree | 6280e0d1ff573c654aeb0b09fa154a6856e02ecf | |
| parent | ecf60ce769f6b482d6312142ea1f91c2573c4425 (diff) | |
| download | portage-cc3ca52718e0f15a2d0a3f3360977e3b33041db9.tar.gz portage-cc3ca52718e0f15a2d0a3f3360977e3b33041db9.tar.bz2 portage-cc3ca52718e0f15a2d0a3f3360977e3b33041db9.zip | |
Correct the package.mask lookup order in getmaskingreason().
svn path=/main/trunk/; revision=5429
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 = [] |