Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 71359 Details for
Bug 110382
flawed grammar in some of emerge's error messages [patch]
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fixes minor textual errors
emerge-grammar-tweaks.patch (text/plain), 2.61 KB, created by
Benno Schulenberg
on 2005-10-24 15:19:30 UTC
(
hide
)
Description:
fixes minor textual errors
Filename:
MIME Type:
Creator:
Benno Schulenberg
Created:
2005-10-24 15:19:30 UTC
Size:
2.61 KB
patch
obsolete
>--- emerge.orig 2005-10-24 23:47:29.000000000 +0200 >+++ emerge 2005-10-25 00:00:55.000000000 +0200 >@@ -513,9 +513,9 @@ > ) > > gcc_distcc_broken_error = green( >- '!!! Relying on the shell to locate gcc, this may break\n' + >- '!!! DISTCC, installing gcc-config and setting your current gcc\n' + >- '!!! profile will fix this' >+ '!!! Relying now on the shell to locate gcc; this may break DISTCC;\n' + >+ '!!! installing gcc-config and setting your current gcc profile\n' + >+ '!!! will fix this.' > ) > > def fallback(): >@@ -1092,14 +1092,14 @@ > portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n") > portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n") > portage.writemsg("!!! to aid in the detection of malicious intent.\n\n") >- portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF A TAMPERED FILES -- CHECK CAREFULLY.\n") >+ portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n") > portage.writemsg("!!! Affected file: %s\n" % (e)) > sys.exit(1) > except portage_exception.InvalidSignature, e: > portage.writemsg("\n\n!!! An invalid gpg signature is preventing portage from calculating the\n") > portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n") > portage.writemsg("!!! to aid in the detection of malicious intent.\n\n") >- portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF A TAMPERED FILES -- CHECK CAREFULLY.\n") >+ portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n") > portage.writemsg("!!! Affected file: %s\n" % (e)) > sys.exit(1) > except SystemExit, e: >@@ -1779,8 +1779,8 @@ > if ("--fetchonly" not in myopts) and ("--buildpkgonly" not in myopts): > for x in mylist: > if x[0]=="blocks": >- print "\n!!! Error: the "+x[2]+" package conflicts with another package." >- print "!!! both can't be installed on the same system together." >+ print "\n!!! Error: the "+x[2]+" package conflicts with another package;" >+ print "!!! the two cannot be installed on the same system together." > print "!!! Please use 'emerge --pretend' to determine blockers." > print > if ("--pretend" not in myopts): >@@ -3154,7 +3154,7 @@ > #check for blocking dependencies > if x[0]=="blocks": > print "\n!!! Error: The above package list contains packages which cannot be installed" >- print "!!! on the same system." >+ print "!!! on the same system together." > print > sys.exit(1) > if mergecount==0:
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 110382
: 71359