diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-06 21:26:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-06 21:26:14 +0000 |
| commit | 36f13a81f93d1d5bf055f78acc2be9f3b70bf122 (patch) | |
| tree | b1320e4d2e3a6f00233f1d2e26d180fb6f95f354 /bin | |
| parent | 2d5ea747d3f4f0ea61f84747066495f640de1567 (diff) | |
| download | portage-36f13a81f93d1d5bf055f78acc2be9f3b70bf122.tar.gz portage-36f13a81f93d1d5bf055f78acc2be9f3b70bf122.tar.bz2 portage-36f13a81f93d1d5bf055f78acc2be9f3b70bf122.zip | |
Misc color fixes. Thanks to Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> for this patch from bug#183861, comment #9. (trunk r7183)
svn path=/main/branches/2.1.2/; revision=7184
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index 412028e70..011b0469a 100755 --- a/bin/emerge +++ b/bin/emerge @@ -695,7 +695,7 @@ def create_world_atom(pkg_key, metadata, args_set, sets, portdb): atom will be returned. Atoms that are in the system set may also be stored in world since system atoms can only match one slot while world atoms can be greedy with respect to slots. Unslotted system packages will not be - not be stored in world.""" + stored in world.""" arg_atom = args_set.findAtomForPackage(pkg_key, metadata) cp = portage.dep_getkey(arg_atom) new_world_atom = cp @@ -3007,17 +3007,17 @@ class depgraph: def pkgprint(pkg): if pkg_merge: - if pkg_world: - return colorize("PKG_MERGE_WORLD", pkg) - elif pkg_system: + if pkg_system: return colorize("PKG_MERGE_SYSTEM", pkg) + elif pkg_world: + return colorize("PKG_MERGE_WORLD", pkg) else: return colorize("PKG_MERGE", pkg) else: - if pkg_world: - return colorize("PKG_NOMERGE_WORLD", pkg) - elif pkg_system: + if pkg_system: return colorize("PKG_NOMERGE_SYSTEM", pkg) + elif pkg_world: + return colorize("PKG_NOMERGE_WORLD", pkg) else: return colorize("PKG_NOMERGE", pkg) |