summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
Diffstat (limited to 'pym')
-rw-r--r--pym/output.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/pym/output.py b/pym/output.py
index 2079bf6d9..3a1bce4e0 100644
--- a/pym/output.py
+++ b/pym/output.py
@@ -142,17 +142,11 @@ codes["UNMERGE_WARN"] = codes["red"]
codes["SECURITY_WARN"] = codes["red"]
codes["MERGE_LIST_PROGRESS"] = codes["yellow"]
codes["PKG_MERGE"] = codes["darkgreen"]
-codes["PKG_MERGE_ARG"] = codes["darkgreen"]
-codes["PKG_MERGE_SYSTEM"] = codes["green"]
+codes["PKG_MERGE_SYSTEM"] = codes["darkgreen"]
codes["PKG_MERGE_WORLD"] = codes["green"]
-codes["PKG_MERGE_ARG_SYSTEM"] = codes["green"]
-codes["PKG_MERGE_ARG_WORLD"] = codes["green"]
codes["PKG_NOMERGE"] = codes["darkblue"]
-codes["PKG_NOMERGE_ARG"] = codes["darkblue"]
-codes["PKG_NOMERGE_SYSTEM"] = codes["blue"]
+codes["PKG_NOMERGE_SYSTEM"] = codes["darkblue"]
codes["PKG_NOMERGE_WORLD"] = codes["blue"]
-codes["PKG_NOMERGE_ARG_SYSTEM"] = codes["blue"]
-codes["PKG_NOMERGE_ARG_WORLD"] = codes["blue"]
def parse_color_map(onerror=None):
"""