[gentoo-portage-dev] [PATCH] slot_conflict_handler: suggest --verbose-conflicts (bug 556172)

[gentoo-portage-dev] [PATCH] slot_conflict_handler: suggest --verbose-conflicts (bug 556172)

[Zac Medico]

A suggestion to use --verbose-conflicts is now shown when relevant:

!!! Multiple package instances within a single package slot have been pulled
!!! into the dependency graph, resulting in a slot conflict:

dev-libs/icu:0

  (dev-libs/icu-54.1-r1:0/54a::gentoo, ebuild scheduled for merge) pulled in by
    <dev-libs/icu-55.1 (Argument)

  (dev-libs/icu-55.1:0/55::gentoo, installed) pulled in by
    dev-libs/icu:0/55 required by (app-office/libreoffice-bin-4.4.3.2:0/0::gentoo, installed)
                ^^^^^
    >=dev-libs/icu-51.2-r1:0/55=[abi_x86_32(-),abi_x86_64(-)] required by (dev-libs/libxml2-2.9.2-r1:2/2::gentoo, installed)
                          ^^^^^^
    (and 19 more with the same problems)

NOTE: Use the '--verbose-conflicts' option to display parents omitted above

X-Gentoo-Bug: 556172
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=556172
---
 pym/_emerge/resolver/slot_collision.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 5473d72..cfb5885 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -242,6 +242,7 @@ class slot_conflict_handler(object):
 		"""
 		_pkg_use_enabled = self.depgraph._pkg_use_enabled
 		verboseconflicts = "--verbose-conflicts" in self.myopts
+		any_omitted_parents = False
 		msg = self.conflict_msg
 		indent = "  "
 		msg.append("\n!!! Multiple package instances within a single " + \
@@ -596,6 +597,7 @@ class slot_conflict_handler(object):
 					
 					omitted_parents = num_all_specific_atoms - len(selected_for_display)
 					if omitted_parents:
+						any_omitted_parents = True
 						msg.append(2*indent)
 						if len(selected_for_display) > 1:
 							msg.append("(and %d more with the same problems)\n" % omitted_parents)
@@ -604,7 +606,14 @@ class slot_conflict_handler(object):
 				else:
 					msg.append(" (no parents)\n")
 				msg.append("\n")
-		msg.append("\n")
+
+		if any_omitted_parents:
+			msg.append(colorize("INFORM",
+				"NOTE: Use the '--verbose-conflicts'"
+				" option to display parents omitted above"))
+			msg.append("\n\n")
+		else:
+			msg.append("\n")
 
 	def get_explanation(self):
 		msg = ""
-- 
2.3.6

Re: [gentoo-portage-dev] [PATCH] slot_conflict_handler: suggest --verbose-conflicts (bug 556172)

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJVuNg/AAoJENQqWdRUGk8B4UoQALkl7IAVJ4vw65ee4t9037TT
3aGANGVhmyMrWYojXfpMqhX6OepMoF0ALdItKqzoQgR3perGF+bSeXxZzaUMWGGV
CXfh9FBJH2OkJSDebgJIHIJdTxdJm3yePe1kh43U6kpO00p7PONRibc0GynnSf71
y2KEOSI+I22h9hou5HVCm1J9rfTVOr7sJMm0943wLdh+WrFrSXJKK8ea210vb2o3
ABny13amEulnYvIKHFVTaMJy/amq/xkheS0hd3O1p8jOwWWSO9ILI1gHVhOafiji
g0/pETZLh/JeGZ1R+wuci+5LmBvZnznMUfi2RQJ3XNQOaUxAHp/bZbLhDZ0TEHrZ
Mwf1K8a0iid0Fh7S5yaX37N8PCBv5W5lwt144IhXFWSBLwg4BxqEYs7CKD7fX5gH
+vThJU6Lodni/kUqLunLz5Buk7+xco0Co+Y/JqdycaU3R2Azab43PFpxxlCZRLv4
9Js4DugO7Uj4Bm2Jq56OipE/CeymnKhoplrEgEqxT+mpLRsAY1KfQiYYejyvdiDK
+V4khMgR9uQisM+rcrziA3uVx8msAyFJTV+Htv5wyebe4B1zBbMoCysOFKodvxbN
QewX+KMr5RSl0IfUQ/BGUX7JJl9xQ22JSIgUssymRSzeRW+AbtSLPFPiyJyOwq9U
TR1+ysSenyig0HXEcOlI
=b6gx
-----END PGP SIGNATURE-----