[[[ Almost always print ::repository in list of packages for installation. --verbose-main-repo-display option is no longer supported. 3 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function have been deleted. ]]]
-- Arfrever Frehtes Taifersar Arahesis
--- man/emerge.1
+++ man/emerge.1
@@ -897,9 +897,6 @@
Make slot conflicts more verbose. Note that this may in some cases output
hundreds of packages for slot conflicts.
.TP
-.BR "\-\-verbose\-main\-repo\-display"
-In the package merge list display, print ::repository even for main repository.
-.TP
.BR "\-\-verbose\-slot\-rebuilds [ y | n ]"
Turns on/off the extra emerge output to list which packages are causing rebuilds.
The default is set to "y" (on).
--- pym/_emerge/depgraph.py
+++ pym/_emerge/depgraph.py
@@ -4293,14 +4293,9 @@
child = None
all_parents = self._dynamic_config._parent_atoms
graph = self._dynamic_config.digraph
- verbose_main_repo_display = "--verbose-main-repo-display" in \
- self._frozen_config.myopts
def format_pkg(pkg):
- pkg_name = "%s" % (pkg.cpv,)
- if verbose_main_repo_display or pkg.repo != \
- pkg.root_config.settings.repositories.mainRepo().name:
- pkg_name += _repo_separator + pkg.repo
+ pkg_name = "%s%s%s" % (pkg.cpv, _repo_separator, pkg.repo)
return pkg_name
if target_atom is not None and isinstance(node, Package):
--- pym/_emerge/main.py
+++ pym/_emerge/main.py
@@ -50,7 +50,6 @@
"--tree",
"--unordered-display",
"--update",
-"--verbose-main-repo-display",
]
shortmapping={
--- pym/_emerge/resolver/output.py
+++ pym/_emerge/resolver/output.py
@@ -387,9 +387,7 @@
if old_pkg.slot != old_pkg.sub_slot or \
old_pkg.slot == pkg.slot and old_pkg.sub_slot != pkg.sub_slot:
key += "/" + old_pkg.sub_slot
- if not self.quiet_repo_display and (self.verbose_main_repo_display or
- self.portdb.repositories.mainRepo() is None or
- any(x.repo != self.portdb.repositories.mainRepo().name for x in myoldbest + [pkg])):
+ if not self.quiet_repo_display:
key += _repo_separator + old_pkg.repo
versions.append(key)
myoldbest_str = blue("["+", ".join(versions)+"]")
@@ -422,9 +420,7 @@
@param pkg_info: dictionary
@rtype string
"""
- if not self.quiet_repo_display and (self.verbose_main_repo_display or
- self.portdb.repositories.mainRepo() is None or
- any(x.repo != self.portdb.repositories.mainRepo().name for x in pkg_info.oldbest_list + [pkg])):
+ if not self.quiet_repo_display:
pkg_str += _repo_separator + pkg.repo
return pkg_str
@@ -819,7 +815,6 @@
# and disable the entire repo display in this case.
repoadd_set = set()
- self.verbose_main_repo_display = "--verbose-main-repo-display" in depgraph._frozen_config.myopts
self.restrict_fetch_list = {}
for mylist_index in range(len(mylist)):
signature.asc
Description: This is a digitally signed message part.
