| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-31 22:53:00 +0000 (Sun, 31 Jan 2010) |
| 3 |
New Revision: 15309 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
Log: |
| 8 |
Clean up config incrementals handling. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/bin/repoman |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/repoman 2010-01-31 22:27:45 UTC (rev 15308) |
| 14 |
+++ main/trunk/bin/repoman 2010-01-31 22:53:00 UTC (rev 15309) |
| 15 |
@@ -91,8 +91,11 @@ |
| 16 |
|
| 17 |
# A sane umask is needed for files that portage creates. |
| 18 |
os.umask(0o22) |
| 19 |
-repoman_settings = portage.config(local_config=False, |
| 20 |
- config_incrementals=portage.const.INCREMENTALS) |
| 21 |
+# Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to |
| 22 |
+# behave incrementally. |
| 23 |
+repoman_incrementals = tuple(x for x in \ |
| 24 |
+ portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') |
| 25 |
+repoman_settings = portage.config(local_config=False) |
| 26 |
repoman_settings.lock() |
| 27 |
|
| 28 |
if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ |
| 29 |
@@ -1749,16 +1752,12 @@ |
| 30 |
if dep_settings is None: |
| 31 |
dep_settings = portage.config( |
| 32 |
config_profile_path=prof.abs_path, |
| 33 |
- config_incrementals=portage.const.INCREMENTALS, |
| 34 |
+ config_incrementals=repoman_incrementals, |
| 35 |
local_config=False, |
| 36 |
env=env) |
| 37 |
if options.without_mask: |
| 38 |
dep_settings.pmaskdict.clear() |
| 39 |
arch_caches[prof.sub_path] = dep_settings |
| 40 |
- # Protect ACCEPT_KEYWORDS from config.regenerate() |
| 41 |
- # (just in case) |
| 42 |
- dep_settings.incrementals = tuple(v for v in \ |
| 43 |
- dep_settings.incrementals if v != 'ACCEPT_KEYWORDS') |
| 44 |
|
| 45 |
xmatch_cache_key = (prof.sub_path, tuple(groups)) |
| 46 |
xcache = arch_xmatch_caches.get(xmatch_cache_key) |
Archives