summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-06 07:36:42 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-06 07:36:42 +0000
commitb87ff97f05d7809942262b1fe535d3aef2e8441d (patch)
tree2bc628b994c907c8a0f05502720eef13c032a823 /bin/repoman
parentCall dep_settings.setcpv() first so that ACCEPT_KEYWORDS when setcpv calls re... (diff)
downloadportage-multirepo-b87ff97f05d7809942262b1fe535d3aef2e8441d.tar.gz
portage-multirepo-b87ff97f05d7809942262b1fe535d3aef2e8441d.tar.bz2
portage-multirepo-b87ff97f05d7809942262b1fe535d3aef2e8441d.zip
Remove ACCEPT_KEYWORDS from incrementals to that a hypothetical config.regenerate() call won't affect it.
svn path=/main/trunk/; revision=4415
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman
index 2da6bea8..0c45724b 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