Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 90574 Details for
Bug 138600
Can't change some colors with color.map
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
emerge.colorize1.diff
emerge.colorize1.diff (text/plain), 7.34 KB, created by
Damien Thébault
on 2006-06-30 15:51:25 UTC
(
hide
)
Description:
emerge.colorize1.diff
Filename:
MIME Type:
Creator:
Damien Thébault
Created:
2006-06-30 15:51:25 UTC
Size:
7.34 KB
patch
obsolete
>--- /usr/bin/emerge.ori 2006-07-01 00:28:09.112301250 +0200 >+++ /usr/bin/emerge 2006-07-01 00:42:52.267495000 +0200 >@@ -831,7 +831,7 @@ > mykey=mytbz2.getelements("CATEGORY")[0]+"/"+os.path.splitext(os.path.basename(x))[0] > if os.path.realpath(x) != \ > os.path.realpath(self.trees["/"]["bintree"].getname(mykey)): >- print red("\n*** You need to adjust PKGDIR to emerge this package.\n") >+ print colorize("BAD", "\n*** You need to adjust PKGDIR to emerge this package.\n") > sys.exit(1) > if not self.create(["binary", self.settings["ROOT"], mykey], > None, "--onlydeps" not in self.myopts): >@@ -844,13 +844,13 @@ > ebuild_path = self.trees["/"]["porttree"].dbapi.findname(mykey) > if ebuild_path: > if os.path.realpath(ebuild_path) != x: >- print red("\n*** You need to adjust PORTDIR or PORTDIR_OVERLAY to emerge this package.\n") >+ print colorize("BAD", "\n*** You need to adjust PORTDIR or PORTDIR_OVERLAY to emerge this package.\n") > sys.exit(1) > if mykey not in self.trees["/"]["porttree"].dbapi.xmatch( > "match-visible", portage.dep_getkey(mykey)): >- print red("\n*** You are emerging a masked package. It is MUCH better to use") >- print red("*** /etc/portage/package.* to accomplish this. See portage(5) man") >- print red("*** page for details.") >+ print colorize("BAD", "\n*** You are emerging a masked package. It is MUCH better to use") >+ print colorize("BAD", "*** /etc/portage/package.* to accomplish this. See portage(5) man") >+ print colorize("BAD", "*** page for details.") > countdown(int(self.settings["EMERGE_WARNING_DELAY"]), > "Continuing...") > else: >@@ -1581,14 +1581,14 @@ > > if myversion != portage.VERSION : > if "--emptytree" in self.myopts: >- p.append(red("***")+" Please update portage to the above version before proceeding.") >+ p.append(colorize("WARN", "***")+" Please update portage to the above version before proceeding.") > p.append(" Failure to do so may result in failed or improper merges.") > p.append(" A simple '"+green("emerge portage")+"' is sufficient.") > p.append("") > elif mylist.index(x) < len(mylist) - 1 and \ > "livecvsportage" not in self.settings.features: >- p.append(red("*** Portage will stop merging at this point and reload itself,")) >- p.append(red(" then resume the merge.")) >+ p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) >+ p.append(colorize("WARN", " then resume the merge.")) > print > del mysplit > >@@ -1688,7 +1688,7 @@ > mysysdict = genericdict(getlist(self.settings, "system")) > if "--resume" in self.myopts: > # We're resuming. >- print green("*** Resuming merge...") >+ print colorize("GOOD", "*** Resuming merge...") > emergelog(xterm_titles, " *** Resuming merge...") > mymergelist=portage.mtimedb["resume"]["mergelist"][:] > if "--skipfirst" in self.myopts and mymergelist: >@@ -2292,8 +2292,8 @@ > #avoid cluttering the preview printout with stuff that isn't getting unmerged > continue > if not (pkgmap[x]["protected"] or pkgmap[x]["omitted"]) and (x in syslist): >- print red("\a\n\n!!! '%s' is part of your system profile." % x) >- print yellow("\a!!! Unmerging it may be damaging to your system.\n") >+ print colorize("BAD","\a\n\n!!! '%s' is part of your system profile." % x) >+ print colorize("WARN","\a!!! Unmerging it may be damaging to your system.\n") > if "--pretend" not in myopts and "--ask" not in myopts: > countdown(int(settings["EMERGE_WARNING_DELAY"]), > colorize("WARN", "Press Ctrl-C to Stop")) >@@ -3112,24 +3112,24 @@ > # dependency of another package. World file is explicit. > > print >- print red("*** WARNING ***")+" --depclean is known to be broken. It is highly recommended" >- print red("*** WARNING ***")+" that "+green("`emerge --update --newuse --deep world`")+" be ran before" >- print red("*** WARNING ***")+" commencing. However, using --depclean may still break link" >- print red("*** WARNING ***")+" level consistency within your system. "+green("`revdep-rebuild`") >- print red("*** WARNING ***")+" from app-portage/gentoolkit can help to detect breakage." >- print red("*** WARNING ***") >- print red("*** WARNING ***")+" Also study the list of packages to be cleaned for any" >- print red("*** WARNING ***")+" obvious mistakes. Packages can be manually added to the" >- print red("*** WARNING ***")+" world list by running "+green("`emerge --noreplace <atom>`")+"." >- print red("*** WARNING ***") >- print red("*** WARNING ***")+" It is normal for packages that are masked or listed in" >- print red("*** WARNING ***")+" package.provided to be removed by depclean. These are the most" >- print red("*** WARNING ***")+" likely reasons that depclean will remove a package even though" >- print red("*** WARNING ***")+" it is in the world or system package set. In order to" >- print red("*** WARNING ***")+" troubleshoot these types of problems, it is often helpful to" >- print red("*** WARNING ***")+" look at the output of "+green("`grep -r <atom> /etc/portage`")+"." >- print red("*** WARNING ***") >- print red("*** WARNING ***")+" "+bold("Make sure you have a backup.") >+ print colorize("BAD", "*** WARNING ***")+" --depclean is known to be broken. It is highly recommended" >+ print colorize("BAD", "*** WARNING ***")+" that "+green("`emerge --update --newuse --deep world`")+" be ran before" >+ print colorize("BAD", "*** WARNING ***")+" commencing. However, using --depclean may still break link" >+ print colorize("BAD", "*** WARNING ***")+" level consistency within your system. "+green("`revdep-rebuild`") >+ print colorize("BAD", "*** WARNING ***")+" from app-portage/gentoolkit can help to detect breakage." >+ print colorize("BAD", "*** WARNING ***") >+ print colorize("BAD", "*** WARNING ***")+" Also study the list of packages to be cleaned for any" >+ print colorize("BAD", "*** WARNING ***")+" obvious mistakes. Packages can be manually added to the" >+ print colorize("BAD", "*** WARNING ***")+" world list by running "+green("`emerge --noreplace <atom>`")+"." >+ print colorize("BAD", "*** WARNING ***") >+ print colorize("BAD", "*** WARNING ***")+" It is normal for packages that are masked or listed in" >+ print colorize("BAD", "*** WARNING ***")+" package.provided to be removed by depclean. These are the most" >+ print colorize("BAD", "*** WARNING ***")+" likely reasons that depclean will remove a package even though" >+ print colorize("BAD", "*** WARNING ***")+" it is in the world or system package set. In order to" >+ print colorize("BAD", "*** WARNING ***")+" troubleshoot these types of problems, it is often helpful to" >+ print colorize("BAD", "*** WARNING ***")+" look at the output of "+green("`grep -r <atom> /etc/portage`")+"." >+ print colorize("BAD", "*** WARNING ***") >+ print colorize("BAD", "*** WARNING ***")+" "+bold("Make sure you have a backup.") > > settings = portage.settings > xterm_titles = "notitles" not in settings.features >@@ -3585,7 +3585,7 @@ > ext = os.path.splitext(x)[1] > if (ext == ".ebuild" or ext == ".tbz2") and os.path.exists(os.path.abspath(x)): > print "emerging by path implies --oneshot... adding --oneshot to options." >- print red("\n*** emerging by path is broken and may not always work!!!\n") >+ print colorize("BAD", "\n*** emerging by path is broken and may not always work!!!\n") > break > > if ("--tree" in myopts) and ("--columns" in myopts):
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 138600
:
90541
| 90574