cros_mark_as_stable: make it work better in repo

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 73 matching lines @@
     _PrintUsageAndDie('Please specify a board')
   if not os.path.isdir(gflags.FLAGS.srcroot):
     _PrintUsageAndDie('srcroot is not a valid path')
   if commit_id_list and (len(package_list) != len(commit_id_list)):
     _PrintUsageAndDie(
         'Package list is not the same length as the commit id list')
 
 
 def _Clean():
   """Cleans up uncommitted changes on either stabilizing branch or master."""
-  if _CheckOnStabilizingBranch():
-    _RunCommand('git reset HEAD --hard')
-  _RunCommand('git checkout master')
   _RunCommand('git reset HEAD --hard')
+  _RunCommand('git checkout %s' % gflags.FLAGS.tracking_branch)
 
 
 def _PrintUsageAndDie(error_message=''):
   """Prints optional error_message the usage and returns an error exit code."""
   command_usage = 'Commands: \n'
   # Add keys and usage information from dictionary.
   commands = sorted(_COMMAND_DICTIONARY.keys())
   for command in commands:
     command_usage += '  %s: %s\n' % (command, _COMMAND_DICTIONARY[command])
   commands_str = '|'.join(commands)
@@ skipping 64 matching lines @@
     """Returns True if the branch exists."""
     branch_cmd = 'git branch'
     branches = _RunCommand(branch_cmd)
     return self.branch_name in branches.split()
 
   def Delete(self):
     """Deletes the branch and returns the user to the master branch.
 
     Returns True on success.
     """
-    self._Checkout('master', create=False)
+    self._Checkout(gflags.FLAGS.tracking_branch, create=False)
     delete_cmd = 'git branch -D %s' % self.branch_name
     _RunCommand(delete_cmd)
 
 
 class _EBuild(object):
   """Wrapper class for an ebuild."""
 
   def __init__(self, package, commit_id=None):
     """Initializes all data about an ebuild.
 
@@ skipping 168 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)