Merged from trunk -r15302:15303

   | 15303   | Fix AttributeError when adjusting incrementals. Thanks to    |
   | zmedico | Jonathan Callen <abcd@g.o> for reporting.                    |

svn path=/main/branches/prefix/; revision=15334

diff --git a/bin/repoman b/bin/repoman
index 13147bcab165e590cfbb6e3f79826e30124343f1..c522bb8506d4ffc3df8134a6d573ea3171bd7167 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1758,6 +1758,10 @@ for x in scanlist:
                                        if options.without_mask:
                                                dep_settings.pmaskdict.clear()
                                        arch_caches[prof.sub_path] = dep_settings
+                                       # 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)