Merge "pre-upload: handle Ctrl+C when running directly" am: e669af6414

Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/2617576

Change-Id: I203bee471f75c44ce1450599614920e72f1ccf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/pre-upload.py b/pre-upload.py
index cf97e10..5c820c6 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -22,6 +22,7 @@ when developing.
 import argparse
 import datetime
 import os
+import signal
 import sys
 from typing import List, Optional
 
@@ -551,9 +552,13 @@ def direct_main(argv):
         if not opts.project:
             parser.error(f"Couldn't identify the project of {opts.dir}")
 
-    if _run_projects_hooks([opts.project], [opts.dir], from_git=opts.git,
-                           commit_list=opts.commits):
-        return 0
+    try:
+        if _run_projects_hooks([opts.project], [opts.dir], from_git=opts.git,
+                               commit_list=opts.commits):
+            return 0
+    except KeyboardInterrupt:
+        print('Aborting execution early due to user interrupt', file=sys.stderr)
+        return 128 + signal.SIGINT
     return 1