diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-30 15:57:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-30 15:57:15 -0700 |
| commit | 2fcfc8ede6cc09aa6f16cea1d732bf669912b28b (patch) | |
| tree | 62b37a3c820809b265af89171f09698f5e153bf6 /pym | |
| parent | 2c7117be05bd57bfc455d717dbb810e8c6fc8829 (diff) | |
| download | portage-2fcfc8ede6cc09aa6f16cea1d732bf669912b28b.tar.gz portage-2fcfc8ede6cc09aa6f16cea1d732bf669912b28b.tar.bz2 portage-2fcfc8ede6cc09aa6f16cea1d732bf669912b28b.zip | |
Make _RepoDisplay show user_location.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 3 | ||||
| -rw-r--r-- | pym/portage/repository/config.py | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index f5ba5f72a..d324d7ef7 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -44,7 +44,7 @@ class _RepoDisplay(object): 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()) + repo_paths.update(root_config.settings.repositories.repoUserLocationList()) repo_paths = list(repo_paths) self._repo_paths = repo_paths self._repo_paths_real = [ os.path.realpath(repo_path) \ @@ -60,7 +60,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 = "?" diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 022c0c8d8..12cadee78 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -316,6 +316,14 @@ class RepoConfigLoader(object): self._prepos_changed = False return self._repo_location_list + def repoUserLocationList(self): + """Get a list of repositories location. Replaces PORTDIR_OVERLAY""" + user_location_list = [] + for repo in self.prepos_order: + if self.prepos[repo].location is not None: + user_location_list.append(self.prepos[repo].user_location) + return tuple(user_location_list) + def mainRepoLocation(self): """Returns the location of main repo""" main_repo = self.prepos['DEFAULT'].main_repo |