diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 19:51:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 19:51:04 +0000 |
| commit | 151f20fab432cf153155744a58298cbba916bc72 (patch) | |
| tree | ba549f74c525fe9594eccb4d2759e04d5aba7363 /bin/repoman | |
| parent | d9c5b9f5f93ec3e99dce27d2fcfb82d4630c0518 (diff) | |
| download | portage-151f20fab432cf153155744a58298cbba916bc72.tar.gz portage-151f20fab432cf153155744a58298cbba916bc72.tar.bz2 portage-151f20fab432cf153155744a58298cbba916bc72.zip | |
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
Diffstat (limited to 'bin/repoman')
| -rwxr-xr-x | bin/repoman | 11 |
1 files changed, 4 insertions, 7 deletions
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) |