diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-01-31 16:06:34 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-01-31 16:06:34 +0000 |
commit | ca6793ac56a7cd9007797611c4465515cdc5992a (patch) | |
tree | ded997a7ceda1e2745c074fc29cac53148f5c3b0 | |
parent | d0187eb2b74ce54befead5ef4ff00c0a2238d1e7 (diff) | |
download | portage-ca6793ac56a7cd9007797611c4465515cdc5992a.tar.gz portage-ca6793ac56a7cd9007797611c4465515cdc5992a.tar.bz2 portage-ca6793ac56a7cd9007797611c4465515cdc5992a.zip |
Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen
<abcd@g.o> for reporting.
svn path=/main/trunk/; revision=15303
-rwxr-xr-x | bin/repoman | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/repoman b/bin/repoman index 857f4612e..c6fe0789d 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) |