Better revert

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6690012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@78029 0039d316-1c4b-4281-b951-d872f2087c98

git_cl/git_cl.py

@@ -711,20 +711,18 @@ def UserEditedLog(starting_text):
   fileobj.close()
 
   # Open up the default editor in the system to get the CL description.
-  result = None
+  ret = subprocess.call(editor + ' ' + filename, shell=True)
-  try:
+  if ret != 0:
-    subprocess.check_call(['env', editor, filename], shell=True)
+    os.remove(filename)
+    return
   fileobj = open(filename)
-    result = fileobj.read()
+  text = fileobj.read()
   fileobj.close()
-  finally:
-    os.remove(filename)
 
-  if not result:
+  os.remove(filename)
-    return
 
   stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
-  return stripcomment_re.sub('', result).strip()
+  return stripcomment_re.sub('', text).strip()
 
 
 def ConvertToInteger(inputval):