Make _RepoDisplay show user_location.

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index f5ba5f72a71237976a9e04e157f0ccc5f7d7cb53..d324d7ef77a13e5a73c77bebd4c951f89a0644ce 100644 (file)
--- 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 022c0c8d8c20edae18efaf209003e6f5cee2a8aa..12cadee781fb1a0af8b9e5efd1886989c8b2e83f 100644 (file)
--- 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