Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen
authorZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 19:51:04 +0000 (19:51 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 2 Mar 2010 19:51:04 +0000 (19:51 -0000)
<abcd@g.o> for reporting. (trunk r15303)

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

bin/repoman

index eecf4d65035a56c4bcb66482bd49e49f7734a101..a7ebb26ae9fbf157578c2a98c69d701c65e94d70 100755 (executable)
@@ -1755,13 +1755,10 @@ for x in scanlist:
                                        if options.without_mask:
                                                dep_settings.pmaskdict.clear()
                                        arch_caches[prof.sub_path] = dep_settings
-                                       while True:
-                                               try:
-                                                       # Protect ACCEPT_KEYWORDS from config.regenerate()
-                                                       # (just in case)
-                                                       dep_settings.incrementals.remove("ACCEPT_KEYWORDS")
-                                               except ValueError:
-                                                       break
+                                       # Protect ACCEPT_KEYWORDS from config.regenerate()
+                                       # (just in case)
+                                       dep_settings.incrementals = tuple(v for v in \
+                                               dep_settings.incrementals if v != 'ACCEPT_KEYWORDS')
 
                                xmatch_cache_key = (prof.sub_path, tuple(groups))
                                xcache = arch_xmatch_caches.get(xmatch_cache_key)