summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-31 22:53:00 +0000
committerZac Medico <zmedico@gentoo.org>2010-01-31 22:53:00 +0000
commitcd967be0bcf7d41813533bcc602693f328014a4b (patch)
tree439e8ec44c1adaeeb55a96c37bdbdc6d38ad1efa
parenta893d41c2951055533944b985cc6045cceaf42a0 (diff)
downloadportage-cd967be0bcf7d41813533bcc602693f328014a4b.tar.gz
portage-cd967be0bcf7d41813533bcc602693f328014a4b.tar.bz2
portage-cd967be0bcf7d41813533bcc602693f328014a4b.zip
Clean up config incrementals handling.
svn path=/main/trunk/; revision=15309
-rwxr-xr-xbin/repoman13
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/repoman b/bin/repoman
index 86139628b..6ec364bbb 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -91,8 +91,11 @@ bad = create_color_func("BAD")
# A sane umask is needed for files that portage creates.
os.umask(0o22)
-repoman_settings = portage.config(local_config=False,
- config_incrementals=portage.const.INCREMENTALS)
+# Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to
+# behave incrementally.
+repoman_incrementals = tuple(x for x in \
+ portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
+repoman_settings = portage.config(local_config=False)
repoman_settings.lock()
if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
@@ -1749,16 +1752,12 @@ for x in scanlist:
if dep_settings is None:
dep_settings = portage.config(
config_profile_path=prof.abs_path,
- config_incrementals=portage.const.INCREMENTALS,
+ config_incrementals=repoman_incrementals,
local_config=False,
env=env)
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)