[reclient] Only show shutdown msg if ctrl-C end the build

Bug: b/300284667
Change-Id: I28151a974cd20cb5ec7a789cf7f7cd0c926b4486
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4864734
Reviewed-by: Junji Watanabe <jwata@google.com>
Commit-Queue: Ben Segall <bentekkie@google.com>
Auto-Submit: Ben Segall <bentekkie@google.com>
changes/34/4864734/6
Ben Segall 2 years ago committed by LUCI CQ
parent d95084e851
commit 1077fbe08a

@ -62,11 +62,12 @@ def main(argv):
'-project=',
'-reapi_instance=',
] + argv[1:]
return siso.main(argv)
try:
return siso.main(argv)
except KeyboardInterrupt:
print("Shutting down reproxy...", file=sys.stderr)
return 1
if __name__ == '__main__':
try:
sys.exit(main(sys.argv))
except KeyboardInterrupt:
sys.exit(1)
sys.exit(main(sys.argv))

@ -22,6 +22,7 @@ def main(argv):
try:
return ninja.main(argv)
except KeyboardInterrupt:
print("Shutting down reproxy...", file=sys.stderr)
return 1

@ -274,7 +274,6 @@ def build_context(argv, tool):
try:
yield
finally:
print("Shutting down reproxy...", file=sys.stderr)
start = time.time()
stop_reproxy(reclient_cfg, reclient_bin_dir)
if os.environ.get('NINJA_SUMMARIZE_BUILD') == '1':

Loading…
Cancel
Save