| 1 |
Author: zmedico |
| 2 |
Date: 2009-11-09 20:51:20 +0000 (Mon, 09 Nov 2009) |
| 3 |
New Revision: 14805 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/actions.py |
| 7 |
main/trunk/pym/_emerge/main.py |
| 8 |
Log: |
| 9 |
Bug #278336 - Use adjust_config to set PORTAGE_QUIET when the config is |
| 10 |
reloaded after sync, so that PORTAGE_QUIET is set when the post_sync |
| 11 |
script is executed. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/actions.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/actions.py 2009-11-08 14:30:55 UTC (rev 14804) |
| 17 |
+++ main/trunk/pym/_emerge/actions.py 2009-11-09 20:51:20 UTC (rev 14805) |
| 18 |
@@ -2144,6 +2144,7 @@ |
| 19 |
|
| 20 |
# Reload the whole config from scratch. |
| 21 |
settings, trees, mtimedb = load_emerge_config(trees=trees) |
| 22 |
+ adjust_configs(myopts, trees) |
| 23 |
root_config = trees[settings["ROOT"]]["root_config"] |
| 24 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
| 25 |
|
| 26 |
@@ -2158,6 +2159,7 @@ |
| 27 |
mtimedb.commit() |
| 28 |
# Reload the whole config from scratch. |
| 29 |
settings, trees, mtimedb = load_emerge_config(trees=trees) |
| 30 |
+ adjust_configs(myopts, trees) |
| 31 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
| 32 |
root_config = trees[settings["ROOT"]]["root_config"] |
| 33 |
|
| 34 |
@@ -2290,6 +2292,13 @@ |
| 35 |
|
| 36 |
return rval |
| 37 |
|
| 38 |
+def adjust_configs(myopts, trees): |
| 39 |
+ for myroot in trees: |
| 40 |
+ mysettings = trees[myroot]["vartree"].settings |
| 41 |
+ mysettings.unlock() |
| 42 |
+ adjust_config(myopts, mysettings) |
| 43 |
+ mysettings.lock() |
| 44 |
+ |
| 45 |
def adjust_config(myopts, settings): |
| 46 |
"""Make emerge specific adjustments to the config.""" |
| 47 |
|
| 48 |
|
| 49 |
Modified: main/trunk/pym/_emerge/main.py |
| 50 |
=================================================================== |
| 51 |
--- main/trunk/pym/_emerge/main.py 2009-11-08 14:30:55 UTC (rev 14804) |
| 52 |
+++ main/trunk/pym/_emerge/main.py 2009-11-09 20:51:20 UTC (rev 14805) |
| 53 |
@@ -37,7 +37,7 @@ |
| 54 |
|
| 55 |
from _emerge.actions import action_config, action_sync, action_metadata, \ |
| 56 |
action_regen, action_search, action_uninstall, action_info, action_build, \ |
| 57 |
- adjust_config, chk_updated_cfg_files, display_missing_pkg_set, \ |
| 58 |
+ adjust_configs, chk_updated_cfg_files, display_missing_pkg_set, \ |
| 59 |
display_news_notification, getportageversion, load_emerge_config |
| 60 |
from _emerge.emergelog import emergelog |
| 61 |
from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo |
| 62 |
@@ -1181,13 +1181,7 @@ |
| 63 |
settings, trees, mtimedb = load_emerge_config(trees=trees) |
| 64 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
| 65 |
|
| 66 |
- for myroot in trees: |
| 67 |
- mysettings = trees[myroot]["vartree"].settings |
| 68 |
- mysettings.unlock() |
| 69 |
- adjust_config(myopts, mysettings) |
| 70 |
- mysettings.lock() |
| 71 |
- del myroot, mysettings |
| 72 |
- |
| 73 |
+ adjust_configs(myopts, trees) |
| 74 |
apply_priorities(settings) |
| 75 |
|
| 76 |
spinner = stdout_spinner() |
Archives