Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15303 - main/trunk/bin
Date: Sun, 31 Jan 2010 16:06:40
Message-Id: E1NbcJn-0006ci-59@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-31 16:06:34 +0000 (Sun, 31 Jan 2010)
3 New Revision: 15303
4
5 Modified:
6 main/trunk/bin/repoman
7 Log:
8 Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen
9 <abcd@g.o> for reporting.
10
11
12 Modified: main/trunk/bin/repoman
13 ===================================================================
14 --- main/trunk/bin/repoman 2010-01-31 09:44:08 UTC (rev 15302)
15 +++ main/trunk/bin/repoman 2010-01-31 16:06:34 UTC (rev 15303)
16 @@ -1755,13 +1755,10 @@
17 if options.without_mask:
18 dep_settings.pmaskdict.clear()
19 arch_caches[prof.sub_path] = dep_settings
20 - while True:
21 - try:
22 - # Protect ACCEPT_KEYWORDS from config.regenerate()
23 - # (just in case)
24 - dep_settings.incrementals.remove("ACCEPT_KEYWORDS")
25 - except ValueError:
26 - break
27 + # Protect ACCEPT_KEYWORDS from config.regenerate()
28 + # (just in case)
29 + dep_settings.incrementals = tuple(v for v in \
30 + dep_settings.incrementals if v != 'ACCEPT_KEYWORDS')
31
32 xmatch_cache_key = (prof.sub_path, tuple(groups))
33 xcache = arch_xmatch_caches.get(xmatch_cache_key)