diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:07:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:07:12 +0000 |
| commit | 4e7f165ea290eb580f2e785e5ded941d09860de2 (patch) | |
| tree | 59e6dc47d9d7c079a45957f62a159a1e7959b9b7 | |
| parent | e784d66f97b7d6d9ec8afbe024d87bed2aa30ac6 (diff) | |
| download | portage-4e7f165ea290eb580f2e785e5ded941d09860de2.tar.gz portage-4e7f165ea290eb580f2e785e5ded941d09860de2.tar.bz2 portage-4e7f165ea290eb580f2e785e5ded941d09860de2.zip | |
Bug #303445 - Fix getmaskingreason() to reset comment state when looping to
the next package.mask file. (trunk r15321)
svn path=/main/branches/2.1.7/; revision=15554
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 2f2c8ff27..a090042af 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -8573,10 +8573,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() |