FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1819 from jhasse/master 

Less verbose output when a task failed if not running with -v
This commit is contained in:
ita1024 2016-09-26 21:47:12 +02:00 committed by GitHub
parent 3286beb4ad 87419b3c6b
commit 43302767dd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
waflib/Task.py
View File

@ -410,7 +410,10 @@ class TaskBase(evil):
:rtype: string :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', '') name = getattr(self.generator, 'name', '')
if getattr(self, "err_msg", None): if getattr(self, "err_msg", None):
return self.err_msg return self.err_msg
@ -418,11 +421,11 @@ class TaskBase(evil):
return 'task in %r was not executed for some reason: %r' % (name, self) return 'task in %r was not executed for some reason: %r' % (name, self)
elif self.hasrun == CRASHED: elif self.hasrun == CRASHED:
try: 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: 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: elif self.hasrun == MISSING:
return ' -> missing files in %r: %r\n%r' % (name, self, msg) return ' -> missing files in %r%s' % (name, msg)
else: else:
return 'invalid status for task in %r: %r' % (name, self.hasrun) return 'invalid status for task in %r: %r' % (name, self.hasrun)