From 87419b3c6ba8ac9b96ab3b75a0d1566b9b04d5ef Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Mon, 26 Sep 2016 12:44:23 +0200 Subject: [PATCH] Less verbose output when a task failed if not running with -v --- waflib/Task.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/waflib/Task.py b/waflib/Task.py index d5e7e07b..0327335a 100644 --- a/waflib/Task.py +++ b/waflib/Task.py @@ -410,7 +410,10 @@ class TaskBase(evil): :rtype: string """ - msg = getattr(self, 'last_cmd', '') + if Logs.verbose: + msg = ': %r\n%r' % (self, getattr(self, 'last_cmd', '')) + else: + msg = ' (run with -v to display more information)' name = getattr(self.generator, 'name', '') if getattr(self, "err_msg", None): return self.err_msg @@ -418,11 +421,11 @@ class TaskBase(evil): return 'task in %r was not executed for some reason: %r' % (name, self) elif self.hasrun == CRASHED: try: - return ' -> task in %r failed (exit status %r): %r\n%r' % (name, self.err_code, self, msg) + return ' -> task in %r failed with exit status %r%s' % (name, self.err_code, msg) except AttributeError: - return ' -> task in %r failed: %r\n%r' % (name, self, msg) + return ' -> task in %r failed%s' % (name, msg) elif self.hasrun == MISSING: - return ' -> missing files in %r: %r\n%r' % (name, self, msg) + return ' -> missing files in %r%s' % (name, msg) else: return 'invalid status for task in %r: %r' % (name, self.hasrun)