diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-23 10:44:04 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-23 10:44:04 -0800 |
| commit | 8ffad57abdaf0904df1e8488dc4c55e201af391e (patch) | |
| tree | 389e8cb6e999c184ff18f8e73fcb63a85c6a2447 /pym/_emerge/resolver/output_helpers.py | |
| parent | 7548cc347065cecf5cb353e084b7ef88ea2d8a94 (diff) | |
| download | portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.tar.gz portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.tar.bz2 portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.zip | |
Fix merge list repo display breakage.
Broken since refactoring in commit
48c8cec7c079cb07a4f421a36cdc46a7fdbc7811.
Diffstat (limited to 'pym/_emerge/resolver/output_helpers.py')
| -rw-r--r-- | pym/_emerge/resolver/output_helpers.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index e5d9a2604..ff6327f4a 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -35,8 +35,11 @@ class _RepoDisplay(object): repo_paths = set() for root_config in roots.values(): portdir = root_config.settings.get("PORTDIR") - if root_config.settings.repositories: - repo_paths.update(root_config.settings.repositories.repoLocationList()) + if portdir: + repo_paths.add(portdir) + overlays = root_config.settings.get("PORTDIR_OVERLAY") + if overlays: + repo_paths.update(overlays.split()) repo_paths = list(repo_paths) self._repo_paths = repo_paths self._repo_paths_real = [ os.path.realpath(repo_path) \ @@ -52,7 +55,6 @@ class _RepoDisplay(object): def repoStr(self, repo_path_real): real_index = -1 if repo_path_real: - repo_path_real = os.path.realpath(repo_path_real) real_index = self._repo_paths_real.index(repo_path_real) if real_index == -1: s = "?" |