bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #41102 - frewsxcv:rollup, r=frewsxcv

Browse source 
Rollup of 5 pull requests

- Successful merges: #40908, #41011, #41026, #41037, #41050
- Failed merges:
This commit is contained in:
bors 2017-04-06 06:07:42 +00:00
commit e5e92753cc
74 changed files with 286 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/bootstrap.py
View file

@ -600,16 +600,19 @@ def bootstrap():
def main():
start_time = time()
help_triggered = ('-h' in sys.argv) or ('--help' in sys.argv) or (len(sys.argv) == 1)
try:
bootstrap()
print("Build completed successfully in %s" % format_build_time(time() - start_time))
if not help_triggered:
print("Build completed successfully in %s" % format_build_time(time() - start_time))
except (SystemExit, KeyboardInterrupt) as e:
if hasattr(e, 'code') and isinstance(e.code, int):
exit_code = e.code
else:
exit_code = 1
print(e)
print("Build completed unsuccessfully in %s" % format_build_time(time() - start_time))
if not help_triggered:
print("Build completed unsuccessfully in %s" % format_build_time(time() - start_time))
sys.exit(exit_code)
if __name__ == '__main__':