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

(-)emerge.orig (-8 / +8 lines)
Lines 513-521 Link Here
513
	)
513
	)
514
514
515
	gcc_distcc_broken_error = green(
515
	gcc_distcc_broken_error = green(
516
	'!!! Relying on the shell to locate gcc, this may break\n' +
516
	'!!! Relying now on the shell to locate gcc; this may break DISTCC;\n' +
517
	'!!! DISTCC, installing gcc-config and setting your current gcc\n' +
517
	'!!! installing gcc-config and setting your current gcc profile\n' +
518
	'!!! profile will fix this'
518
	'!!! will fix this.'
519
	)
519
	)
520
520
521
	def fallback():
521
	def fallback():
Lines 1092-1105 Link Here
1092
					portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n")
1092
					portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n")
1093
					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
1093
					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
1094
					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
1094
					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
1095
					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF A TAMPERED FILES -- CHECK CAREFULLY.\n")
1095
					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n")
1096
					portage.writemsg("!!! Affected file: %s\n" % (e))
1096
					portage.writemsg("!!! Affected file: %s\n" % (e))
1097
					sys.exit(1)
1097
					sys.exit(1)
1098
				except portage_exception.InvalidSignature, e:
1098
				except portage_exception.InvalidSignature, e:
1099
					portage.writemsg("\n\n!!! An invalid gpg signature is preventing portage from calculating the\n")
1099
					portage.writemsg("\n\n!!! An invalid gpg signature is preventing portage from calculating the\n")
1100
					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
1100
					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
1101
					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
1101
					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
1102
					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF A TAMPERED FILES -- CHECK CAREFULLY.\n")
1102
					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n")
1103
					portage.writemsg("!!! Affected file: %s\n" % (e))
1103
					portage.writemsg("!!! Affected file: %s\n" % (e))
1104
					sys.exit(1)
1104
					sys.exit(1)
1105
				except SystemExit, e:
1105
				except SystemExit, e:
Lines 1779-1786 Link Here
1779
		if ("--fetchonly" not in myopts) and ("--buildpkgonly" not in myopts):
1779
		if ("--fetchonly" not in myopts) and ("--buildpkgonly" not in myopts):
1780
			for x in mylist:
1780
			for x in mylist:
1781
				if x[0]=="blocks":
1781
				if x[0]=="blocks":
1782
					print "\n!!! Error: the "+x[2]+" package conflicts with another package."
1782
					print "\n!!! Error: the "+x[2]+" package conflicts with another package;"
1783
					print   "!!!        both can't be installed on the same system together."
1783
					print   "!!!        the two cannot be installed on the same system together."
1784
					print   "!!!        Please use 'emerge --pretend' to determine blockers."
1784
					print   "!!!        Please use 'emerge --pretend' to determine blockers."
1785
					print
1785
					print
1786
					if ("--pretend" not in myopts):
1786
					if ("--pretend" not in myopts):
Lines 3154-3160 Link Here
3154
				#check for blocking dependencies
3154
				#check for blocking dependencies
3155
				if x[0]=="blocks":
3155
				if x[0]=="blocks":
3156
					print "\n!!! Error: The above package list contains packages which cannot be installed"
3156
					print "\n!!! Error: The above package list contains packages which cannot be installed"
3157
					print   "!!!        on the same system."
3157
					print   "!!!        on the same system together."
3158
					print
3158
					print
3159
					sys.exit(1)
3159
					sys.exit(1)
3160
			if mergecount==0:
3160
			if mergecount==0:

Return to bug 110382