Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 317775
Collapse All | Expand All

(-)a/pym/_emerge/depgraph.py (-8 / +4 lines)
Lines 4682-4693 class depgraph(object): Link Here
4682
							p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,"))
4682
							p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,"))
4683
							p.append(colorize("WARN", "    then resume the merge."))
4683
							p.append(colorize("WARN", "    then resume the merge."))
4684
4684
4685
		out = sys.stdout
4686
		show_repos = repoadd_set and repoadd_set != set(["0"])
4685
		show_repos = repoadd_set and repoadd_set != set(["0"])
4687
4686
4688
		for x in p:
4687
		for x in p:
4689
			if isinstance(x, basestring):
4688
			if isinstance(x, basestring):
4690
				out.write("%s\n" % (x,))
4689
				writemsg_stdout("%s\n" % (x,), noiselevel=-1)
4691
				continue
4690
				continue
4692
4691
4693
			myprint, verboseadd, repoadd = x
4692
			myprint, verboseadd, repoadd = x
Lines 4698-4711 class depgraph(object): Link Here
4698
			if show_repos and repoadd:
4697
			if show_repos and repoadd:
4699
				myprint += " " + teal("[%s]" % repoadd)
4698
				myprint += " " + teal("[%s]" % repoadd)
4700
4699
4701
			out.write("%s\n" % (myprint,))
4700
			writemsg_stdout("%s\n" % (myprint,), noiselevel=-1)
4702
4701
4703
		for x in blockers:
4702
		for x in blockers:
4704
			print(x)
4703
			writemsg_stdout("%s\n" % (x,), noiselevel=-1)
4705
4704
4706
		if verbosity == 3:
4705
		if verbosity == 3:
4707
			print()
4706
			writemsg_stdout('\n%s' % (counters,), noiselevel=-1)
4708
			print(counters)
4709
			if show_repos:
4707
			if show_repos:
4710
				# In python-2.x, str() can trigger a UnicodeEncodeError here,
4708
				# In python-2.x, str() can trigger a UnicodeEncodeError here,
4711
				# so call __str__() directly.
4709
				# so call __str__() directly.
Lines 4717-4723 class depgraph(object): Link Here
4717
				writemsg_stdout(bold('*'+revision) + '\n' + text,
4715
				writemsg_stdout(bold('*'+revision) + '\n' + text,
4718
					noiselevel=-1)
4716
					noiselevel=-1)
4719
4717
4720
		sys.stdout.flush()
4721
		return os.EX_OK
4718
		return os.EX_OK
4722
4719
4723
	def _tree_display(self, mylist):
4720
	def _tree_display(self, mylist):
4724
- 

Return to bug 317775