From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 19:51:04 +0000 (-0000)
Subject: Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen
X-Git-Tag: v2.1.8~184
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=151f20fab432cf153155744a58298cbba916bc72;p=portage.git

Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen
<abcd@g.o> for reporting. (trunk r15303)

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

diff --git a/bin/repoman b/bin/repoman
index eecf4d650..a7ebb26ae 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -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)