[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[Zac Medico]

commit:     9b9e7413f314574ec8224b4c54a5153315d77a8e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 20:20:26 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 21:25:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b9e7413

lib/portage/elog/mod_syslog.py: drop unused-import

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/elog/mod_syslog.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/portage/elog/mod_syslog.py b/lib/portage/elog/mod_syslog.py
index 4dabacc52..caf6c1f08 100644
--- a/lib/portage/elog/mod_syslog.py
+++ b/lib/portage/elog/mod_syslog.py
@@ -1,11 +1,9 @@
 # elog/mod_syslog.py - elog dispatch module
-# Copyright 2006-2014 Gentoo Foundation
+# Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import syslog
 from portage.const import EBUILD_PHASES
-from portage import _encodings
-
 
 _pri = {
 	"INFO"   : syslog.LOG_INFO,

[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[Zac Medico]

commit:     2eab003dae81672836c40908d26cc7692836c21e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 23:51:55 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 05:57:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2eab003d

lib/portage/elog/mod_custom.py: fix multiple-imports

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

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

diff --git a/lib/portage/elog/mod_custom.py b/lib/portage/elog/mod_custom.py
index 836bdad62..7cfafeccc 100644
--- a/lib/portage/elog/mod_custom.py
+++ b/lib/portage/elog/mod_custom.py
@@ -2,7 +2,9 @@
 # Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import portage.elog.mod_save, portage.process, portage.exception
+import portage.elog.mod_save
+import portage.exception
+import portage.process
 
 def process(mysettings, key, logentries, fulltext):
 	elogfilename = portage.elog.mod_save.process(mysettings, key, logentries, fulltext)

[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[Zac Medico]

commit:     01b69027b4fb5407c6eff4e9d05ceedfa23d7938
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 23:51:54 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 05:57:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=01b69027

lib/portage/elog/mod_mail.py: fix multiple-imports

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

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

diff --git a/lib/portage/elog/mod_mail.py b/lib/portage/elog/mod_mail.py
index 4edf507eb..38eaa277f 100644
--- a/lib/portage/elog/mod_mail.py
+++ b/lib/portage/elog/mod_mail.py
@@ -2,7 +2,9 @@
 # Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import portage.mail, socket
+import portage.mail
+import socket
+
 from portage.exception import PortageException
 from portage.localization import _
 from portage.util import writemsg

[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[Sam James]

commit:     2e572b9edc48a6d4623df1c2c46ba34316f7e72a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 03:55:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 10:36:47 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e572b9e

elog: mod_echo: use binpkg coloring

With the 'echo' elog module, we get messages like:
```
 * Messages for package X
 * Log file: /var/log/portage/build/[...]
```

Colorize 'X' based on whether it's a binpkg or not, rather than always using
green as if it was built from source.

Bug: https://bugs.gentoo.org/914159
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/elog/mod_echo.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/portage/elog/mod_echo.py b/lib/portage/elog/mod_echo.py
index a63939988a..e8a0d49fc4 100644
--- a/lib/portage/elog/mod_echo.py
+++ b/lib/portage/elog/mod_echo.py
@@ -22,7 +22,9 @@ def process(mysettings, key, logentries, fulltext):
         and "PORTAGE_LOG_FILE" in mysettings
     ):
         logfile = mysettings["PORTAGE_LOG_FILE"]
-    _items.append((mysettings["ROOT"], key, logentries, logfile))
+
+    binary = mysettings.configdict["pkg"]["MERGE_TYPE"] == "binary"
+    _items.append((mysettings["ROOT"], key, logentries, logfile, binary))
 
 
 def finalize():
@@ -42,14 +44,17 @@ def finalize():
 def _finalize():
     global _items
     printer = EOutput()
-    for root, key, logentries, logfile in _items:
+    for root, key, logentries, logfile, binary in _items:
+        color = "PKG_BINARY_MERGE" if binary else "INFORM"
+
         print()
+
         if root == "/":
-            printer.einfo(_("Messages for package %s:") % colorize("INFORM", key))
+            printer.einfo(_("Messages for package %s:") % colorize(color, key))
         else:
             printer.einfo(
                 _("Messages for package %(pkg)s merged to %(root)s:")
-                % {"pkg": colorize("INFORM", key), "root": root}
+                % {"pkg": colorize(color, key), "root": root}
             )
         if logfile is not None:
             printer.einfo(_("Log file: %s") % colorize("INFORM", logfile))

[gentoo-commits] proj/portage:master commit in: lib/portage/elog/

[Sam James]

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))