Handle KeyboardInterrupt consistently in python scripts

git_cherry_pick_upload.py

Index: git_cherry_pick_upload.py
diff --git a/git_cherry_pick_upload.py b/git_cherry_pick_upload.py
index 2a048faae37db55c2f2a920bb8f685cfdfe4f7ae..acab167877b174608935b8eb093876ea6f34e2b7 100755
--- a/git_cherry_pick_upload.py
+++ b/git_cherry_pick_upload.py
@@ -139,6 +139,12 @@ def main():
   )
   args = parser.parse_args()
   cherry_pick(args.branch, args.commit)
+  return 0
+
 
 if __name__ == '__main__':
-  sys.exit(main())
+  try:
+    sys.exit(main())
+  except KeyboardInterrupt:
+    print 'interrupted'
+    sys.exit(1)