From a323da487a2380484e6c23514cc1f75b8e8ceaaf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Dec 2011 12:44:47 -0800 Subject: Display EROOT when ROOT != "/". Since commit a715b65f7bd36409c1283e6911265d1f4405ab7a, the Package.root and RootConfig.root attributes refer to EROOT instead of ROOT. Therefore, adjust display code so that EROOT is only displayed when ROOT != "/". --- pym/_emerge/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/_emerge/main.py') diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 0a9bd1d70..d02f2a605 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1547,9 +1547,10 @@ def repo_name_duplicate_check(trees): def config_protect_check(trees): for root, root_trees in trees.items(): - if not root_trees["root_config"].settings.get("CONFIG_PROTECT"): + settings = root_trees["root_config"].settings + if not settings.get("CONFIG_PROTECT"): msg = "!!! CONFIG_PROTECT is empty" - if root != "/": + if settings["ROOT"] != "/": msg += " for '%s'" % root msg += "\n" writemsg_level(msg, level=logging.WARN, noiselevel=-1) -- cgit v1.2.3-1-g7c22