Fix try/finally clause when uploading an issue

R=cmp@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/9222016

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

gcl.py

@@ -857,7 +857,8 @@ def CMDupload(change_info, args):
 
   upload_arg.extend(args)
 
-  desc_file = ""
+  desc_file = None
+  try:
     if change_info.issue:  # Uploading a new patchset.
       found_message = False
       for arg in args:
@@ -887,7 +888,7 @@ def CMDupload(change_info, args):
         cc_list = ','.join(filter(None, [cc_list] + watchers))
       if cc_list:
         upload_arg.append("--cc=" + cc_list)
-    upload_arg.append("--description_file=" + desc_file + "")
+      upload_arg.append("--description_file=%s" % desc_file)
       if change_info.subject:
         upload_arg.append("--message=" + change_info.subject)
 
@@ -913,12 +914,12 @@ def CMDupload(change_info, args):
         change_info.issue = int(issue)
         change_info.patchset = int(patchset)
         change_info.Save()
-
-    if desc_file:
-      os.remove(desc_file)
       change_info.PrimeLint()
     finally:
       os.chdir(previous_cwd)
+  finally:
+    if desc_file:
+      os.remove(desc_file)
   print "*** Upload does not submit a try; use gcl try to submit a try. ***"
   return 0