Update cros_mark_as_stable.py to also update the private overlay

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 50 matching lines @@
 _STABLE_BRANCH_NAME = 'stabilizing_branch'
 
 # ======================= Global Helper Functions ========================
 
 
 def _Print(message):
   """Verbose print function."""
   if gflags.FLAGS.verbose:
     Info(message)
 
+
+def _BuildEBuildDictionary(overlays, package_list, commit_id_list):
+  for index in range(len(package_list)):
+    package = package_list[index]
+    commit_id = ''
+    if commit_id_list:
+      commit_id = commit_id_list[index]
+    ebuild = _EBuild(package, commit_id)
+    if ebuild.ebuild_path:
+      for overlay in overlays:
+        if ebuild.ebuild_path.startswith(overlay):
+          overlays[overlay].append(ebuild)
+          break
+      else:
+        Die('No overlay found for %s' % ebuild.ebuild_path)
+    else:
+      Die('No ebuild found for %s' % package)
+
+
 def _CheckOnStabilizingBranch():
   """Returns true if the git branch is on the stabilizing branch."""
   current_branch = _SimpleRunCommand('git branch | grep \*').split()[1]
   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')
@@ skipping 124 matching lines @@
   @classmethod
   def _FindEBuildPath(cls, package):
     """Static method that returns the full path of an ebuild."""
     _Print('Looking for unstable ebuild for %s' % package)
     equery_cmd = (
         'ACCEPT_KEYWORDS="x86 arm amd64" equery-%s which %s 2> /dev/null'
             % (gflags.FLAGS.board, package))
     path = _SimpleRunCommand(equery_cmd)
     if path:
       _Print('Unstable ebuild found at %s' % path)
-    return path
+    return path.rstrip()
 
   @classmethod
   def _ParseEBuildPath(cls, ebuild_path):
     """Static method that parses the path of an ebuild
 
     Returns a tuple containing the (ebuild path without the revision
     string, without the version string, and the current revision number for
     the ebuild).
     """
      # Get the ebuild name without the revision string.
@@ skipping 38 matching lines @@
         IOError: Error occurred while writing to the new revved ebuild file.
     """
     # TODO(sosa):  Change to a check.
     if not self._ebuild:
       Die('Invalid ebuild given to EBuildStableMarker')
 
     new_ebuild_path = '%s-r%d.ebuild' % (self._ebuild.ebuild_path_no_revision,
                                          self._ebuild.current_revision + 1)
 
     _Print('Creating new stable ebuild %s' % new_ebuild_path)
-    shutil.copyfile('%s-9999.ebuild' % self._ebuild.ebuild_path_no_version,
-                    new_ebuild_path)
+    workon_ebuild = '%s-9999.ebuild' % self._ebuild.ebuild_path_no_version
+    if not os.path.exists(workon_ebuild):
+      Die('Missing 9999 ebuild: %s' % workon_ebuild)
+    shutil.copyfile(workon_ebuild, new_ebuild_path)
 
     for line in fileinput.input(new_ebuild_path, inplace=1):
       # Has to be done here to get changes to sys.stdout from fileinput.input.
       if not redirect_file:
         redirect_file = sys.stdout
       if line.startswith('KEYWORDS'):
         # Actually mark this file as stable by removing ~'s.
         redirect_file.write(line.replace("~", ""))
       elif line.startswith('EAPI'):
         # Always add new commit_id after EAPI definition.
@@ skipping 38 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)
 
-  overlay_directory = '%s/third_party/chromiumos-overlay' % gflags.FLAGS.srcroot
+  overlays = {
+    '%s/private-overlays/chromeos-overlay' % gflags.FLAGS.srcroot: [],
+    '%s/third_party/chromiumos-overlay' % gflags.FLAGS.srcroot: []
+  }
+  _BuildEBuildDictionary(overlays, package_list, commit_id_list)
 
-  os.chdir(overlay_directory)
+  for overlay, ebuilds in overlays.items():
+    if not os.path.exists(overlay):
+      continue
+    os.chdir(overlay)
 
-  if command == 'clean':
-    _Clean()
-  elif command == 'commit':
-    work_branch = _GitBranch(_STABLE_BRANCH_NAME)
-    work_branch.CreateBranch()
-    if not work_branch.Exists():
-      Die('Unable to create stabilizing branch in %s' %
-                               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:
-      Warning('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], overlay_directory))
-      raise e
-  elif command == 'push':
-    _PushChange()
+    if command == 'clean':
+      _Clean()
+    elif command == 'push':
+      _PushChange()
+    elif command == 'commit' and ebuilds:
+      work_branch = _GitBranch(_STABLE_BRANCH_NAME)
+      work_branch.CreateBranch()
+      if not work_branch.Exists():
+        Die('Unable to create stabilizing branch in %s' % overlay)
+      for ebuild in ebuilds:
+        try:
+          _Print('Working on %s' % ebuild.package)
+          worker = EBuildStableMarker(ebuild)
+          worker.RevEBuild(ebuild.commit_id)
+          message = _GIT_COMMIT_MESSAGE % (ebuild.package, ebuild.commit_id)
+          worker.CommitChange(message)
+        except (OSError, IOError):
+          Warning('Cannot rev %s\n' % ebuild.package,
+                  'Note you will have to go into %s '
+                  'and reset the git repo yourself.' % overlay)
+          raise
 
 
 if __name__ == '__main__':
   main(sys.argv)