From f1dca8d840cfc3d98ed87b5e191bc2c139b1949e Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 10 Feb 2010 18:46:43 +0000 Subject: [PATCH] Merged from trunk -r15302:15303 | 15303 | Fix AttributeError when adjusting incrementals. Thanks to | | zmedico | Jonathan Callen for reporting. | svn path=/main/branches/prefix/; revision=15334 --- bin/repoman | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/repoman b/bin/repoman index 13147bcab..c522bb850 100755 --- 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) -- 2.26.2