| 1 |
commit: 7dc23bc66b410b5a2f9640dc93ca65f5b2678670 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 28 23:57:43 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 08:44:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7dc23bc6 |
| 7 |
|
| 8 |
depgraph: clarify "update has been skipped" message (bug 602854) |
| 9 |
|
| 10 |
When an update has been skipped, clearly display both the selected and |
| 11 |
skipped packages. |
| 12 |
|
| 13 |
X-Gentoo-bug: 602854 |
| 14 |
X-Gentoo-bug-url: https://bugs.gentoo.org/602854 |
| 15 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
pym/_emerge/depgraph.py | 9 ++++++++- |
| 18 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 21 |
index cb12b05..e298337 100644 |
| 22 |
--- a/pym/_emerge/depgraph.py |
| 23 |
+++ b/pym/_emerge/depgraph.py |
| 24 |
@@ -1044,7 +1044,14 @@ class depgraph(object): |
| 25 |
writemsg(str(pkg.slot_atom), noiselevel=-1) |
| 26 |
if pkg.root_config.settings["ROOT"] != "/": |
| 27 |
writemsg(" for %s" % (pkg.root,), noiselevel=-1) |
| 28 |
- writemsg("\n", noiselevel=-1) |
| 29 |
+ writemsg("\n\n", noiselevel=-1) |
| 30 |
+ |
| 31 |
+ selected_pkg = next(self._dynamic_config._package_tracker.match( |
| 32 |
+ pkg.root, pkg.slot_atom), None) |
| 33 |
+ |
| 34 |
+ writemsg(" selected: %s\n" % (selected_pkg,), noiselevel=-1) |
| 35 |
+ writemsg(" skipped: %s (see unsatisfied dependency below)\n" |
| 36 |
+ % (pkg,), noiselevel=-1) |
| 37 |
|
| 38 |
for parent, root, atom in parent_atoms: |
| 39 |
self._show_unsatisfied_dep(root, atom, myparent=parent) |
Archives