Remove ACCEPT_KEYWORDS from incrementals to that a hypothetical config.regenerate...

svn path=/main/trunk/; revision=4415

diff --git a/bin/repoman b/bin/repoman
index 2da6bea86d17e68632e8a505d04b115325394e0c..0c45724bda5a6d4e75eaad617454a54e43fea259 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1130,6 +1130,13 @@ for x in scanlist:
                                                config_profile_path=profdir,
                                                config_incrementals=portage_const.INCREMENTALS)
                                        arch_caches[prof[0]] = dep_settings
+                                       while True:
+                                               try:
+                                                       # Protect ACCEPT_KEYWORDS from config.regenerate()
+                                                       # (just in case)
+                                                       dep_settings.incrementals.remove("ACCEPT_KEYWORDS")
+                                               except ValueError:
+                                                       break
 
                                trees["/"]["porttree"].settings = dep_settings
                                portdb.mysettings = dep_settings