| 1 |
Author: grobian |
| 2 |
Date: 2010-02-10 18:46:43 +0000 (Wed, 10 Feb 2010) |
| 3 |
New Revision: 15334 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
Log: |
| 8 |
Merged from trunk -r15302:15303 |
| 9 |
|
| 10 |
| 15303 | Fix AttributeError when adjusting incrementals. Thanks to | |
| 11 |
| zmedico | Jonathan Callen <abcd@g.o> for reporting. | |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/prefix/bin/repoman |
| 15 |
=================================================================== |
| 16 |
--- main/branches/prefix/bin/repoman 2010-02-10 00:13:16 UTC (rev 15333) |
| 17 |
+++ main/branches/prefix/bin/repoman 2010-02-10 18:46:43 UTC (rev 15334) |
| 18 |
@@ -1758,6 +1758,10 @@ |
| 19 |
if options.without_mask: |
| 20 |
dep_settings.pmaskdict.clear() |
| 21 |
arch_caches[prof.sub_path] = dep_settings |
| 22 |
+ # Protect ACCEPT_KEYWORDS from config.regenerate() |
| 23 |
+ # (just in case) |
| 24 |
+ dep_settings.incrementals = tuple(v for v in \ |
| 25 |
+ dep_settings.incrementals if v != 'ACCEPT_KEYWORDS') |
| 26 |
|
| 27 |
xmatch_cache_key = (prof.sub_path, tuple(groups)) |
| 28 |
xcache = arch_xmatch_caches.get(xmatch_cache_key) |
Archives