diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-03-04 11:22:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-04 11:22:15 +0000 |
| commit | 621646020cf04e6d47058f045cf88f2d690329d6 (patch) | |
| tree | 488a5f0fbac524e5eaf681a73b9fa9732ee263d2 /pym | |
| parent | Add news about splitting the top-level __init__.py. (trunk r15730) (diff) | |
| download | portage-multirepo-621646020cf04e6d47058f045cf88f2d690329d6.tar.gz portage-multirepo-621646020cf04e6d47058f045cf88f2d690329d6.tar.bz2 portage-multirepo-621646020cf04e6d47058f045cf88f2d690329d6.zip | |
Add new colors for binary packages in the merge list. Thanks to Sebastian
Luther (few) for this patch. (trunk r15739)
svn path=/main/branches/2.1.7/; revision=15746
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 18 | ||||
| -rw-r--r-- | pym/portage/output.py | 3 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b1b655ec..d05cd466 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 3fbb0c99..7e8ed91c 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"] = ( "darkgreen", ) +_styles["PKG_BINARY_MERGE_SYSTEM"] = ( "darkgreen", ) +_styles["PKG_BINARY_MERGE_WORLD"] = ( "green", ) _styles["PKG_UNINSTALL"] = ( "red", ) _styles["PKG_NOMERGE"] = ( "darkblue", ) _styles["PKG_NOMERGE_SYSTEM"] = ( "darkblue", ) |