From 2a471073e87fae58baee203054b1fae3fbcd3ebf Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 10 May 2011 17:29:23 +0000 Subject: [PATCH] Make gcl and git-cl don't throw when a vim user does :cg That's just noise for the maintainer. R=dpranke@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/6985002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@84803 0039d316-1c4b-4281-b951-d872f2087c98 --- gcl.py | 8 ++++++-- git_cl.py | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcl.py b/gcl.py index 413e2bb6d..f64f67221 100755 --- a/gcl.py +++ b/gcl.py @@ -1119,8 +1119,12 @@ def CMDchange(args): if sys.platform == 'win32' and os.environ.get('TERM') == 'msys': # Msysgit requires the usage of 'env' to be present. cmd = 'env ' + cmd - # shell=True to allow the shell to handle all forms of quotes in $EDITOR. - subprocess.check_call(cmd, shell=True) + try: + # shell=True to allow the shell to handle all forms of quotes in + # $EDITOR. + subprocess.check_call(cmd, shell=True) + except subprocess.CalledProcessError, e: + ErrorExit('Editor returned %d' % e.returncode) result = gclient_utils.FileRead(filename, 'r') finally: os.remove(filename) diff --git a/git_cl.py b/git_cl.py index 9e1124c65..5cf2580e4 100755 --- a/git_cl.py +++ b/git_cl.py @@ -842,7 +842,10 @@ def UserEditedLog(starting_text): # Msysgit requires the usage of 'env' to be present. cmd = 'env ' + cmd # shell=True to allow the shell to handle all forms of quotes in $EDITOR. - subprocess.check_call(cmd, shell=True) + try: + subprocess.check_call(cmd, shell=True) + except subprocess.CalledProcessError, e: + DieWithError('Editor returned %d' % e.returncode) fileobj = open(filename) text = fileobj.read() fileobj.close()