| 1 |
Author: zmedico |
| 2 |
Date: 2010-03-02 19:51:04 +0000 (Tue, 02 Mar 2010) |
| 3 |
New Revision: 15538 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/bin/repoman |
| 7 |
Log: |
| 8 |
Fix AttributeError when adjusting incrementals. Thanks to Jonathan Callen |
| 9 |
<abcd@g.o> for reporting. (trunk r15303) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.7/bin/repoman |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.7/bin/repoman 2010-03-02 19:50:48 UTC (rev 15537) |
| 14 |
+++ main/branches/2.1.7/bin/repoman 2010-03-02 19:51:04 UTC (rev 15538) |
| 15 |
@@ -1755,13 +1755,10 @@ |
| 16 |
if options.without_mask: |
| 17 |
dep_settings.pmaskdict.clear() |
| 18 |
arch_caches[prof.sub_path] = dep_settings |
| 19 |
- while True: |
| 20 |
- try: |
| 21 |
- # Protect ACCEPT_KEYWORDS from config.regenerate() |
| 22 |
- # (just in case) |
| 23 |
- dep_settings.incrementals.remove("ACCEPT_KEYWORDS") |
| 24 |
- except ValueError: |
| 25 |
- break |
| 26 |
+ # Protect ACCEPT_KEYWORDS from config.regenerate() |
| 27 |
+ # (just in case) |
| 28 |
+ dep_settings.incrementals = tuple(v for v in \ |
| 29 |
+ dep_settings.incrementals if v != 'ACCEPT_KEYWORDS') |
| 30 |
|
| 31 |
xmatch_cache_key = (prof.sub_path, tuple(groups)) |
| 32 |
xcache = arch_xmatch_caches.get(xmatch_cache_key) |
Archives