aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-01-25 22:13:34 -0500
committerMike Gilbert <floppym@gentoo.org>2017-01-25 23:18:23 -0500
commit65d2cc0514c0c91bb47ed78142446a8eb7d75a26 (patch)
tree8a82bbf048080d00d8fcb10abccba61596227e30
parentaction_sync: fix TypeError: 'int' object is not subscriptable (bug 606588) (diff)
downloadportage-65d2cc0514c0c91bb47ed78142446a8eb7d75a26.tar.gz
portage-65d2cc0514c0c91bb47ed78142446a8eb7d75a26.tar.bz2
portage-65d2cc0514c0c91bb47ed78142446a8eb7d75a26.zip
emerge: fix error handling for clean_logs
CleanLogs.clean() now returns a tuple (returncode, messages). Fixes: f143e58dd3fd ("emaint: exit with non-zero status code when module fails (bug 567478)") X-Gentoo-Bug: 607236 X-Gentoo-Bug-URL: https://bugs.gentoo.org/607236
-rw-r--r--pym/_emerge/post_emerge.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/post_emerge.py b/pym/_emerge/post_emerge.py
index 0cb533cf8..7e6063c52 100644
--- a/pym/_emerge/post_emerge.py
+++ b/pym/_emerge/post_emerge.py
@@ -29,10 +29,10 @@ def clean_logs(settings):
return
cleanlogs = CleanLogs()
- errors = cleanlogs.clean(settings=settings)
- if errors:
+ returncode, msgs = cleanlogs.clean(settings=settings)
+ if not returncode:
out = portage.output.EOutput()
- for msg in errors:
+ for msg in msgs:
out.eerror(msg)
def display_news_notification(root_config, myopts):