aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-03-21 19:25:55 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-03-21 19:25:55 (GMT)
commitcf7bf7667a56a28a6c6f360bc77a01d05d64bdd8 (patch)
tree537462ba4638c730e53faff7ade7a9ee59dc8d57
parentBug #361759: QA check for /etc/udev/rules.d (diff)
downloadportage-cf7bf7667a56a28a6c6f360bc77a01d05d64bdd8.zip
portage-cf7bf7667a56a28a6c6f360bc77a01d05d64bdd8.tar.gz
portage-cf7bf7667a56a28a6c6f360bc77a01d05d64bdd8.tar.bz2
getmaskingreason: use remember_source_file
This will fix bug #409179.
-rw-r--r--pym/portage/package/ebuild/getmaskingreason.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py
index f2af638..8a88c2f 100644
--- a/pym/portage/package/ebuild/getmaskingreason.py
+++ b/pym/portage/package/ebuild/getmaskingreason.py
@@ -83,7 +83,13 @@ def getmaskingreason(mycpv, metadata=None, settings=None,
pmasklists = []
for profile in locations:
pmask_filename = os.path.join(profile, "package.mask")
- pmasklists.append((pmask_filename, grablines(pmask_filename, recursive=1)))
+ node = None
+ for l, recursive_filename in grablines(pmask_filename,
+ recursive=1, remember_source_file=True):
+ if node is None or node[0] != recursive_filename:
+ node = (recursive_filename, [])
+ pmasklists.append(node)
+ node[1].append(l)
pmaskdict = settings._mask_manager._pmaskdict
if mycp in pmaskdict: