commit:     7fe73e2e2d72192afe63668d60d2a0945ee3fd67
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 09:47:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 09:47:44 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=7fe73e2e

elog: mod_echo: handle unmerging for binary coloring

Fixes: 2e572b9edc48a6d4623df1c2c46ba34316f7e72a
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/elog/mod_echo.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/portage/elog/mod_echo.py b/lib/portage/elog/mod_echo.py
index e8a0d49fc4..1043edf201 100644
--- a/lib/portage/elog/mod_echo.py
+++ b/lib/portage/elog/mod_echo.py
@@ -23,7 +23,10 @@ def process(mysettings, key, logentries, fulltext):
     ):
         logfile = mysettings["PORTAGE_LOG_FILE"]
 
-    binary = mysettings.configdict["pkg"]["MERGE_TYPE"] == "binary"
+    try:
+        binary = mysettings.configdict["pkg"]["MERGE_TYPE"] == "binary"
+    except KeyError:
+        binary = False
     _items.append((mysettings["ROOT"], key, logentries, logfile, binary))
 
 

Reply via email to