diff options
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 14 | ||||
| -rw-r--r-- | pym/portage/output.py | 24 |
2 files changed, 19 insertions, 19 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index dc1df199d..4bf288af5 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -694,7 +694,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 @@ -3060,17 +3060,17 @@ class depgraph(object): 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) diff --git a/pym/portage/output.py b/pym/portage/output.py index e4db6f6ff..1dd45866d 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -117,17 +117,17 @@ codes["darkteal"] = codes["turquoise"] # Some terminals have darkyellow instead of brown. codes["0xAAAA00"] = codes["brown"] codes["darkyellow"] = codes["0xAAAA00"] -codes["fuscia"] = codes["fuchsia"] -codes["white"] = codes["bold"] - -codes["bg_black"] = esc_seq + "40m" -codes["bg_red"] = esc_seq + "41m" -codes["bg_green"] = esc_seq + "42m" -codes["bg_brown"] = esc_seq + "43m" -codes["bg_blue"] = esc_seq + "44m" -codes["bg_magenta"] = esc_seq + "45m" -codes["bg_cyan"] = esc_seq + "46m" -codes["bg_white"] = esc_seq + "47m" + +codes["bg_black"] = esc_seq + "40m" +codes["bg_darkred"] = esc_seq + "41m" +codes["bg_darkgreen"] = esc_seq + "42m" +codes["bg_brown"] = esc_seq + "43m" +codes["bg_darkblue"] = esc_seq + "44m" +codes["bg_purple"] = esc_seq + "45m" +codes["bg_teal"] = esc_seq + "46m" +codes["bg_lightgray"] = esc_seq + "47m" + +codes["bg_darkyellow"] = codes["bg_brown"] # Colors from /sbin/functions.sh codes["GOOD"] = codes["green"] @@ -288,7 +288,7 @@ def colorize(color_key, text): return text compat_functions_colors = ["bold","white","teal","turquoise","darkteal", - "fuscia","fuchsia","purple","blue","darkblue","green","darkgreen","yellow", + "fuchsia","purple","blue","darkblue","green","darkgreen","yellow", "brown","darkyellow","red","darkred"] def create_color_func(color_key): |