From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Sep 2006 07:36:42 +0000 (-0000)
Subject: Remove ACCEPT_KEYWORDS from incrementals to that a hypothetical config.regenerate... 
X-Git-Tag: v2.1.1~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b87ff97f05d7809942262b1fe535d3aef2e8441d;p=portage.git

Remove ACCEPT_KEYWORDS from incrementals to that a hypothetical config.regenerate() call won't affect it.

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

diff --git a/bin/repoman b/bin/repoman
index 2da6bea86..0c45724bd 100755
--- 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