Don't mask out errors in cros_mark_as_stable

cros_mark_as_stable.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module uprevs a given package's ebuild to the next revision."""
 
 
 import fileinput
@@ skipping 119 matching lines @@
         _STABLE_BRANCH_NAME
     return
 
   description = _RunCommand('git log --format=format:%s%n%n%b ' +
                             gflags.FLAGS.tracking_branch + '..')
   description = 'Marking set of ebuilds as stable\n\n%s' % description
   merge_branch_name = 'merge_branch'
   _RunCommand('git remote update')
   _RunCommand('git checkout -b %s %s' % (
       merge_branch_name, gflags.FLAGS.tracking_branch))
-  try:
-    _RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)
-    _RunCommand('git commit -m "%s"' % description)
-    # Ugh. There has got to be an easier way to push to a tracking branch
-    _RunCommand('git config push.default tracking')
-    _RunCommand('git push')
-  finally:
-    _RunCommand('git checkout %s' % _STABLE_BRANCH_NAME)
-    _RunCommand('git branch -D %s' % merge_branch_name)
+  _RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)
+  _RunCommand('git commit -m "%s"' % description)
+  # Ugh. There has got to be an easier way to push to a tracking branch
+  _RunCommand('git config push.default tracking')
+  _RunCommand('git push')

[Chris Masone, 2010/08/19 00:47:51]

Ok...so now what happens if there's an error?

 
 
 def _RunCommand(command):
   """Runs a shell command and returns stdout back to caller."""
   _Print('  + %s' % command)
   proc_handle = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
   return proc_handle.communicate()[0]
 
 
 # ======================= End Global Helper Functions ========================
@@ skipping 213 matching lines @@
              'and reset the git repo yourself.' %
              (package_list[:index], overlay_directory))
       raise e
   elif command == 'push':
     _PushChange()
 
 
 if __name__ == '__main__':
   main(sys.argv)