Skip to content

Commit 14aff06

Browse files
committed
Modifying behavior of 'silent' option in toolchains
The 'silent' option has always been present in the toolchains API, however it did not actually stop anything from being printed. Instead, it just changed what was added to the build log. This make the 'silent' stop all prints, but ensures that the output for the toolchain is still preserved and accessible via the 'get_output' function.
1 parent 87103ab commit 14aff06

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

tools/toolchains/__init__.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -370,24 +370,24 @@ def print_notify(self, event, silent=False):
370370
msg = '[%(severity)s] %(file)s@%(line)s,%(col)s: %(message)s' % event
371371

372372
elif event['type'] == 'progress':
373-
if not silent:
374-
if 'percent' in event:
375-
msg = '{} [{:>5.1f}%]: {}'.format(event['action'].title(),
376-
event['percent'],
377-
basename(event['file']))
378-
else:
379-
msg = '{}: {}'.format(event['action'].title(),
380-
basename(event['file']))
373+
if 'percent' in event:
374+
msg = '{} [{:>5.1f}%]: {}'.format(event['action'].title(),
375+
event['percent'],
376+
basename(event['file']))
377+
else:
378+
msg = '{}: {}'.format(event['action'].title(),
379+
basename(event['file']))
381380

382381
if msg:
383-
print msg
382+
if not silent:
383+
print msg
384384
self.output += msg + "\n"
385385

386386
def print_notify_verbose(self, event, silent=False):
387387
""" Default command line notification with more verbose mode
388388
"""
389389
if event['type'] in ['info', 'debug']:
390-
self.print_notify(event) # standard handle
390+
self.print_notify(event, silent=silent) # standard handle
391391

392392
elif event['type'] == 'cc':
393393
event['severity'] = event['severity'].title()
@@ -396,7 +396,8 @@ def print_notify_verbose(self, event, silent=False):
396396
event['target_name'] = event['target_name'].upper() if event['target_name'] else "Unknown"
397397
event['toolchain_name'] = event['toolchain_name'].upper() if event['toolchain_name'] else "Unknown"
398398
msg = '[%(severity)s] %(target_name)s::%(toolchain_name)s::%(file)s@%(line)s: %(message)s' % event
399-
print msg
399+
if not silent:
400+
print msg
400401
self.output += msg + "\n"
401402

402403
elif event['type'] == 'progress':

0 commit comments

Comments
 (0)