diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-19 12:44:47 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-19 12:44:47 -0800 |
| commit | a323da487a2380484e6c23514cc1f75b8e8ceaaf (patch) | |
| tree | 637e34a710c5993a0e81b00132c1934f8d84c4ed /pym/_emerge/main.py | |
| parent | 2ea565e1af3416ab5743c4b7181476d9a6734123 (diff) | |
| download | portage-a323da487a2380484e6c23514cc1f75b8e8ceaaf.tar.gz portage-a323da487a2380484e6c23514cc1f75b8e8ceaaf.tar.bz2 portage-a323da487a2380484e6c23514cc1f75b8e8ceaaf.zip | |
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 != "/".
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 5 |
1 files changed, 3 insertions, 2 deletions
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) |