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/resolver | |
| 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/resolver')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index b73b19061..bed5e44e8 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -833,7 +833,7 @@ class Display(object): if self.include_mask_str(): addl += self.gen_mask_str(pkg) - if pkg.root != "/": + if pkg.root_config.settings["ROOT"] != "/": if pkg_info.oldbest: pkg_info.oldbest += " " if self.conf.columns: diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index 320713882..1d522aabd 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -244,7 +244,7 @@ class slot_conflict_handler(object): for (slot_atom, root), pkgs \ in self.slot_collision_info.items(): msg.append(str(slot_atom)) - if root != '/': + if root != self.depgraph._frozen_config._running_root.root: msg.append(" for %s" % (root,)) msg.append("\n\n") |