Merged from trunk -r15732:15739

   | 15739   | Add new colors for binary packages in the merge list. Thanks |
   | zmedico | to Sebastian Luther (few) for this patch.                    |

svn path=/main/branches/prefix/; revision=15742

diff --git a/man/color.map.5 b/man/color.map.5
index 9ce76ad26f5050560b4a4d935c03d209415467fa..94f550d7e4a4f207b65f25c9d2febc8670193852 100644 (file)
--- 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 831b6e81f8854849097e608ebe07f0313c6de8e7..f0f60464b1506237c8c8b94aa295b72a1bdff023 100644 (file)
--- 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 6caf47c19fd8caa0b9bd5824f7566c0dd32c5a1f..407238c167ad6524212e52c52ab600bab291d59c 100644 (file)
--- 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", )