cros_mark_as_stable: add a --srcroot command-line option

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 15 matching lines @@
                      """Optional list of commit ids for each package.
                      This list must either be empty or have the same length as
                      the packages list.  If not set all rev'd ebuilds will have
                      empty commit id's.""",
                      short_name='i')
 gflags.DEFINE_string('packages', '',
                      'Space separated list of packages to mark as stable.',
                      short_name='p')
 gflags.DEFINE_string('push_options', '',
                      'Options to use with git-cl push using push command.')
+gflags.DEFINE_string('srcroot',  '%s/trunk/src' % os.environ['HOME'],
+                     'Used with commit to specify branch to track against.',

[petkov, 2010/08/02 18:35:23]

Update option description.

+                     short_name='r')
 gflags.DEFINE_string('tracking_branch', 'origin',
                      'Used with commit to specify branch to track against.',
                      short_name='t')
 gflags.DEFINE_boolean('verbose', False,
                       'Prints out verbose information about what is going on.',
                       short_name='v')
 
 
-# TODO(sosa):  Remove hard-coding of overlays directory once there is a better
-# way.
-_CHROMIUMOS_OVERLAYS_DIRECTORY = \
-    '%s/trunk/src/third_party/chromiumos-overlay' % os.environ['HOME']
-
 # Takes two strings, package_name and commit_id.
 _GIT_COMMIT_MESSAGE = \
   'Marking 9999 ebuild for %s with commit %s as stable.'
 
 # Dictionary of valid commands with usage information.
 _COMMAND_DICTIONARY = {
                         'clean':
                           'Cleans up previous calls to either commit or push',
                         'commit':
                           'Marks given ebuilds as stable locally',
@@ skipping 18 matching lines @@
   return current_branch == _STABLE_BRANCH_NAME
 
 def _CheckSaneArguments(package_list, commit_id_list, command):
   """Checks to make sure the flags are sane.  Dies if arguments are not sane."""
   if not command in _COMMAND_DICTIONARY.keys():
     _PrintUsageAndDie('%s is not a valid command' % command)
   if not gflags.FLAGS.packages and command == 'commit':
     _PrintUsageAndDie('Please specify at least one package')
   if not gflags.FLAGS.board and command == 'commit':
     _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')
@@ skipping 25 matching lines @@
   Raises:
       OSError: Error occurred while pushing.
   """
 
   # TODO(sosa) - Add logic for buildbot to check whether other slaves have
   # completed and push this change only if they have.
 
   # Sanity check to make sure we're on a stabilizing branch before pushing.
   if not _CheckOnStabilizingBranch():
     generate_test_report.Die('Expected %s to be on branch "%s"' %
-                             (_CHROMIUMOS_OVERLAYS_DIRECTORY,
-                              _STABLE_BRANCH_NAME))
+                             (os.getcwd(), _STABLE_BRANCH_NAME))
   _RunCommand('git cl upload --desc_from_logs -m "%s"' %
     'Marking set of ebuilds as stable')
   _RunCommand('git remote update')
   _RunCommand('git rebase origin/master')
   _RunCommand('git cl push %s' % gflags.FLAGS.push_options)
 
 
 def _RunCommand(command):
   """Runs a shell command and returns stdout back to caller."""
   _Print('  + %s' % command)
@@ skipping 178 matching lines @@
   except gflags.FlagsError, e :
     _PrintUsageAndDie(str(e))
 
   package_list = gflags.FLAGS.packages.split()
   if gflags.FLAGS.commit_ids:
     commit_id_list = gflags.FLAGS.commit_ids.split()
   else:
     commit_id_list = None
   _CheckSaneArguments(package_list, commit_id_list, command)
 
-  os.chdir(_CHROMIUMOS_OVERLAYS_DIRECTORY)
+  overlay_directory = '%s/third_party/chromiumos-overlay' % gflags.FLAGS.srcroot
+

[petkov, 2010/08/02 18:35:23]

no need for blank line, i think

+  os.chdir(overlay_directory)
 
   if command == 'clean':
     _Clean()
   elif command == 'commit':
     work_branch = _GitBranch(_STABLE_BRANCH_NAME)
     work_branch.CreateBranch()
     if not work_branch.Exists():
       generate_test_report.Die('Unable to create stabilizing branch in %s' %
-                               _CHROMIUMOS_OVERLAYS_DIRECTORY)
+                               overlay_directory)
     index = 0
     try:
       for index in range(len(package_list)):
         # Gather the package and optional commit id to work on.
         package = package_list[index]
         commit_id = ""
         if commit_id_list:
           commit_id = commit_id_list[index]
 
         _Print('Working on %s' % package)
         worker = EBuildStableMarker(_EBuild(package, commit_id))
         worker.RevEBuild(commit_id)
         worker.CommitChange(_GIT_COMMIT_MESSAGE % (package, commit_id))
 
     except (OSError, IOError), e:
       print ('An exception occurred\n'
              'Only the following packages were revved: %s\n'
              'Note you will have to go into %s'
              'and reset the git repo yourself.' %
-             (package_list[:index], _CHROMIUMOS_OVERLAYS_DIRECTORY))
+             (package_list[:index], overlay_directory))
       raise e
   elif command == 'push':
     _PushChange()
 
 
 if __name__ == '__main__':
   main(sys.argv)