Bug #303445 - Fix getmaskingreason() to reset comment state when looping to
authorZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:07:12 +0000 (20:07 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 20:07:12 +0000 (20:07 -0000)
the next package.mask file. (trunk r15321)

svn path=/main/branches/2.1.7/; revision=15554

pym/portage/__init__.py

index 2f2c8ff27e75b2944260a94eb346f123b4fc2781..a090042af7e3d04c77e7c70d322ceb217d8cb04a 100644 (file)
@@ -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()