Revert "Have the ability for the PFQ to both rev Chrome and ..."

bin/cros_mark_chrome_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 Chrome for cbuildbot.
 
 After calling, it prints outs CHROME_VERSION_ATOM=(version atom string).  A
 caller could then use this atom with emerge to build the newly uprevved version
@@ skipping 327 matching lines @@
 
   if stable_candidate:
     Info('Stable candidate found %s' % stable_candidate)
   else:
     Info('No stable candidate found.')
 
   os.chdir(overlay_dir)
   work_branch = cros_mark_as_stable.GitBranch(
       cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
   work_branch.CreateBranch()
-  chrome_version_atom = MarkChromeEBuildAsStable(
-      stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
-      commit_to_use, overlay_dir, sticky_ebuild)
-  # Explicit print to communicate to caller.
-  if chrome_version_atom:
-    print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
+  try:
+    chrome_version_atom = MarkChromeEBuildAsStable(
+        stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
+        commit_to_use, overlay_dir, sticky_ebuild)
+    # Explicit print to communicate to caller.
+    if chrome_version_atom:
+      print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
+    else:
+      work_branch.Delete()
+  except:
+    work_branch.Delete()
+    raise
 
 
 if __name__ == '__main__':
   main()