Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15321 - main/trunk/pym/portage
Date: Thu, 04 Feb 2010 19:31:16
Message-Id: E1Nd7Q0-00073d-HS@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-02-04 19:31:11 +0000 (Thu, 04 Feb 2010)
3 New Revision: 15321
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 Bug #303445 - Fix getmaskingreason() to reset comment state when looping to
9 the next package.mask file.
10
11
12 Modified: main/trunk/pym/portage/__init__.py
13 ===================================================================
14 --- main/trunk/pym/portage/__init__.py 2010-02-04 19:09:17 UTC (rev 15320)
15 +++ main/trunk/pym/portage/__init__.py 2010-02-04 19:31:11 UTC (rev 15321)
16 @@ -8576,10 +8576,9 @@
17 if mycp in settings.pmaskdict:
18 for x in settings.pmaskdict[mycp]:
19 if match_from_list(x, cpv_slot_list):
20 - comment = ""
21 - l = "\n"
22 - comment_valid = -1
23 for pmask in pmasklists:
24 + comment = ""
25 + comment_valid = -1
26 pmask_filename = os.path.join(pmask[0], "package.mask")
27 for i in range(len(pmask[1])):
28 l = pmask[1][i].strip()