From da35f20d752830b90630c2e41672b0861fec5b3b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Nov 2009 00:29:54 +0000 Subject: Bug #278336 - Use adjust_config to set PORTAGE_QUIET when the config is reloaded after sync, so that PORTAGE_QUIET is set when the post_sync script is executed. (trunk r14805) svn path=/main/branches/2.1.7/; revision=14828 --- pym/_emerge/actions.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pym/_emerge/actions.py') diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index ac4cf999e..092f34510 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1968,6 +1968,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # Reload the whole config from scratch. settings, trees, mtimedb = load_emerge_config(trees=trees) + adjust_configs(myopts, trees) root_config = trees[settings["ROOT"]]["root_config"] portdb = trees[settings["ROOT"]]["porttree"].dbapi @@ -1982,6 +1983,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): mtimedb.commit() # Reload the whole config from scratch. settings, trees, mtimedb = load_emerge_config(trees=trees) + adjust_configs(myopts, trees) portdb = trees[settings["ROOT"]]["porttree"].dbapi root_config = trees[settings["ROOT"]]["root_config"] @@ -2114,6 +2116,13 @@ def action_uninstall(settings, trees, ldpath_mtimes, return rval +def adjust_configs(myopts, trees): + for myroot in trees: + mysettings = trees[myroot]["vartree"].settings + mysettings.unlock() + adjust_config(myopts, mysettings) + mysettings.lock() + def adjust_config(myopts, settings): """Make emerge specific adjustments to the config.""" -- cgit v1.2.3-1-g7c22