summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-03 19:03:48 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-03 19:03:48 +0000
commit645c639da87b1c8a2156a6e107da9e3c90f9f70d (patch)
tree9cdc6675dd3c1eba94286c5ac43672277b5ab80e
parentac21f12e425a8ba46f119ee2cbe64e25670f6f4d (diff)
downloadportage-645c639da87b1c8a2156a6e107da9e3c90f9f70d.tar.gz
portage-645c639da87b1c8a2156a6e107da9e3c90f9f70d.tar.bz2
portage-645c639da87b1c8a2156a6e107da9e3c90f9f70d.zip
Add new colors for binary packages in the merge list. Thanks to Sebastian
Luther (few) for this patch. svn path=/main/trunk/; revision=15739
-rw-r--r--man/color.map.59
-rw-r--r--pym/_emerge/depgraph.py18
-rw-r--r--pym/portage/output.py3
3 files changed, 25 insertions, 5 deletions
diff --git a/man/color.map.5 b/man/color.map.5
index 9ce76ad26..94f550d7e 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -50,6 +50,15 @@ Defines color used for system packages planned to be merged.
\fBPKG_MERGE_WORLD\fR = \fI"green"\fR
Defines color used for world packages planned to be merged.
.TP
+\fBPKG_BINARY_MERGE\fR = \fI"purple"\fR
+Defines color used for packages planned to be merged using a binary package.
+.TP
+\fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR
+Defines color used for system packages planned to be merged using a binary package.
+.TP
+\fBPKG_BINARY_MERGE_WORLD\fR = \fI"fuchsia"\fR
+Defines color used for world packages planned to be merged using a binary package.
+.TP
\fBPKG_NOMERGE\fR = \fI"darkblue"\fR
Defines color used for packages not planned to be merged.
.TP
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 811e6f522..ff9478911 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4500,12 +4500,20 @@ class depgraph(object):
def pkgprint(pkg_str):
if pkg_merge:
- if pkg_system:
- return colorize("PKG_MERGE_SYSTEM", pkg_str)
- elif pkg_world:
- return colorize("PKG_MERGE_WORLD", pkg_str)
+ if built:
+ if pkg_system:
+ return colorize("PKG_BINARY_MERGE_SYSTEM", pkg_str)
+ elif pkg_world:
+ return colorize("PKG_BINARY_MERGE_WORLD", pkg_str)
+ else:
+ return colorize("PKG_BINARY_MERGE", pkg_str)
else:
- return colorize("PKG_MERGE", pkg_str)
+ if pkg_system:
+ return colorize("PKG_MERGE_SYSTEM", pkg_str)
+ elif pkg_world:
+ return colorize("PKG_MERGE_WORLD", pkg_str)
+ else:
+ return colorize("PKG_MERGE", pkg_str)
elif pkg_status == "uninstall":
return colorize("PKG_UNINSTALL", pkg_str)
else:
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 3fbb0c992..971400d76 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -139,6 +139,9 @@ _styles["PKG_BLOCKER_SATISFIED"] = ( "darkblue", )
_styles["PKG_MERGE"] = ( "darkgreen", )
_styles["PKG_MERGE_SYSTEM"] = ( "darkgreen", )
_styles["PKG_MERGE_WORLD"] = ( "green", )
+_styles["PKG_BINARY_MERGE"] = ( "purple", )
+_styles["PKG_BINARY_MERGE_SYSTEM"] = ( "purple", )
+_styles["PKG_BINARY_MERGE_WORLD"] = ( "fuchsia", )
_styles["PKG_UNINSTALL"] = ( "red", )
_styles["PKG_NOMERGE"] = ( "darkblue", )
_styles["PKG_NOMERGE_SYSTEM"] = ( "darkblue", )