summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/resolver/output.py14
-rw-r--r--pym/_emerge/resolver/output_helpers.py8
2 files changed, 12 insertions, 10 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index af8b9401e..502aaeed7 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -326,7 +326,7 @@ class Display(object):
# now use the data to generate output
if pkg.installed or not slot_matches:
- repoadd = self.conf.repo_display.repoStr(
+ self.repoadd = self.conf.repo_display.repoStr(
pkg_info.repo_path_real)
else:
repo_path_prev = None
@@ -334,14 +334,14 @@ class Display(object):
repo_path_prev = self.portdb.getRepositoryPath(
repo_name_prev)
if repo_path_prev == pkg_info.repo_path_real:
- repoadd = self.conf.repo_display.repoStr(
+ self.repoadd = self.conf.repo_display.repoStr(
pkg_info.repo_path_real)
else:
- repoadd = "%s=>%s" % (
+ self.repoadd = "%s=>%s" % (
self.conf.repo_display.repoStr(repo_path_prev),
self.conf.repo_display.repoStr(pkg_info.repo_path_real))
- if repoadd:
- repoadd_set.add(repoadd)
+ if self.repoadd:
+ repoadd_set.add(self.repoadd)
@staticmethod
@@ -785,7 +785,7 @@ class Display(object):
addl, pkg_info.oldbest, myinslotlist = \
self._get_installed_best(pkg, pkg_info)
self.verboseadd = ""
- repoadd = None
+ self.repoadd = None
self._display_use(pkg, pkg_info.oldbest, myinslotlist)
self.recheck_hidden(pkg)
if self.conf.verbosity == 3:
@@ -829,7 +829,7 @@ class Display(object):
if self.conf.columns and pkg.operation == "uninstall":
continue
- self.print_msg.append((myprint, self.verboseadd, repoadd))
+ self.print_msg.append((myprint, self.verboseadd, self.repoadd))
if not self.conf.tree_display \
and not self.conf.no_restart \
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 = "?"