Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 157897 | Differences between
and this patch

Collapse All | Expand All

(-)bin/emerge (-7 / +16 lines)
Lines 862-870 Link Here
862
			"package slot have been "
862
			"package slot have been "
863
		print "!!! pulled into the dependency graph:"
863
		print "!!! pulled into the dependency graph:"
864
		print
864
		print
865
		for cpv in packages:
865
		for node, parents in packages:
866
			print "    ", cpv
866
			print node,
867
		print
867
			if parents:
868
				print "pulled in by"
869
				for parent in parents:
870
					print "  ", parent
871
			else:
872
				print "(no parents)"
873
			print
868
874
869
		msg = []
875
		msg = []
870
		msg.append("It may be possible to solve this problem ")
876
		msg.append("It may be possible to solve this problem ")
Lines 1000-1006 Link Here
1000
							priority=priority)
1006
							priority=priority)
1001
					return 1
1007
					return 1
1002
				else:
1008
				else:
1003
					self._show_slot_collision_notice((mykey, e_cpv))
1009
					e_parents = self.digraph.parent_nodes(existing_node)
1010
					myparents = []
1011
					if myparent:
1012
						myparents.append(myparent)
1013
					self._show_slot_collision_notice(
1014
						((tuple(mybigkey), myparents),
1015
						(existing_node, e_parents)))
1004
					return 0
1016
					return 0
1005
1017
1006
			jbigkey = tuple(mybigkey)
1018
			jbigkey = tuple(mybigkey)
Lines 1497-1505 Link Here
1497
						# The existing node can be reused.
1509
						# The existing node can be reused.
1498
						selected_pkg = [e_type, myroot, e_cpv,
1510
						selected_pkg = [e_type, myroot, e_cpv,
1499
							self.useFlags[myroot][e_cpv]]
1511
							self.useFlags[myroot][e_cpv]]
1500
					else:
1501
						self._show_slot_collision_notice((mycpv, e_cpv))
1502
						return 0
1503
1512
1504
			if myparent:
1513
			if myparent:
1505
				#we are a dependency, so we want to be unconditionally added
1514
				#we are a dependency, so we want to be unconditionally added

Return to bug 157897