summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-04 19:31:11 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-04 19:31:11 +0000
commitb3882c095a289d5df7207015ca06de82dd72e425 (patch)
tree4d1e49e16dc8aa75ebf3e6667a0e336cc23e8f92
parent5527b61fb49d0136a8faa89edf9bdf80a20066a9 (diff)
downloadportage-b3882c095a289d5df7207015ca06de82dd72e425.tar.gz
portage-b3882c095a289d5df7207015ca06de82dd72e425.tar.bz2
portage-b3882c095a289d5df7207015ca06de82dd72e425.zip
Bug #303445 - Fix getmaskingreason() to reset comment state when looping to
the next package.mask file. svn path=/main/trunk/; revision=15321
-rw-r--r--pym/portage/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index eae469ac9..6d358f516 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -8576,10 +8576,9 @@ def getmaskingreason(mycpv, metadata=None, settings=None, portdb=None, return_lo
if mycp in settings.pmaskdict:
for x in settings.pmaskdict[mycp]:
if match_from_list(x, cpv_slot_list):
- comment = ""
- l = "\n"
- comment_valid = -1
for pmask in pmasklists:
+ comment = ""
+ comment_valid = -1
pmask_filename = os.path.join(pmask[0], "package.mask")
for i in range(len(pmask[1])):
l = pmask[1][i].strip()