Add 0.0.1 logic to new cros_mark.

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 75 matching lines @@
 def _BestEBuild(ebuilds):
   """Returns the newest EBuild from a list of EBuild objects."""
   from portage.versions import vercmp
   winner = ebuilds[0]
   for ebuild in ebuilds[1:]:
     if vercmp(winner.version, ebuild.version) < 0:
       winner = ebuild
   return winner
 
 
-def _FindStableEBuilds(files):
-  """Return a list of stable ebuilds from specified list of files.
+def _FindUprevCandidates(files):
+  """Return a list of uprev candidates from specified list of files.
+
+  Usually an uprev candidate is a the stable ebuild in a cros_workon directory.
+  However, if no such stable ebuild exists (someone just checked in the 9999
+  ebuild), this is the unstable ebuild.
 
   Args:
     files: List of files.
   """
   workon_dir = False
   stable_ebuilds = []
   unstable_ebuilds = []
   for path in files:
     if path.endswith('.ebuild') and not os.path.islink(path):
       ebuild = _EBuild(path)
@@ skipping 16 matching lines @@
       # the older ebuilds will not get rev'd.
       #
       # We make a special exception for x11-drivers/xf86-video-msm for legacy
       # reasons.
       if stable_ebuilds[0].package != 'x11-drivers/xf86-video-msm':
         Warning('Found multiple stable ebuilds in %s' % os.path.dirname(path))
 
     if not unstable_ebuilds:
       Die('Missing 9999 ebuild in %s' % os.path.dirname(path))
     if not stable_ebuilds:
-      Die('Missing stable ebuild in %s' % os.path.dirname(path))
+      Warning('Missing stable ebuild in %s' % os.path.dirname(path))
+      return unstable_ebuilds[0]
 
   if stable_ebuilds:
     return stable_ebuilds[0]
   else:
     return None
 
 
 def _BuildEBuildDictionary(overlays, all, packages):
   """Build a dictionary of the ebuilds in the specified overlays.
 
   overlays: A map which maps overlay directories to arrays of stable EBuilds
     inside said directories.
   all: Whether to include all ebuilds in the specified directories. If true,
     then we gather all packages in the directories regardless of whether
     they are in our set of packages.
   packages: A set of the packages we want to gather.
   """
   for overlay in overlays:
     for package_dir, dirs, files in os.walk(overlay):
       # Add stable ebuilds to overlays[overlay].
       paths = [os.path.join(package_dir, path) for path in files]
-      ebuild = _FindStableEBuilds(paths)
+      ebuild = _FindUprevCandidates(paths)
 
       # If the --all option isn't used, we only want to update packages that
       # are in packages.
       if ebuild and (all or ebuild.package in packages):
         overlays[overlay].append(ebuild)
 
 
 def _CheckOnStabilizingBranch():
   """Returns true if the git branch is on the stabilizing branch."""
   current_branch = _SimpleRunCommand('git branch | grep \*').split()[1]
@@ skipping 203 matching lines @@
     (ebuild_no_rev, _, rev_string) = ebuild_path.rpartition('-')
 
     # Verify the revision string starts with the revision character.
     if rev_string.startswith('r'):
       # Get the ebuild name without the revision and version strings.
       ebuild_no_version = ebuild_no_rev.rpartition('-')[0]
       rev_string = rev_string[1:].rpartition('.ebuild')[0]
     else:
       # Has no revision so we stripped the version number instead.
       ebuild_no_version = ebuild_no_rev
-      ebuild_no_rev = ebuild_path.rpartition('.ebuild')[0]
-      rev_string = "0"
+      ebuild_no_rev = ebuild_path.rpartition('9999.ebuild')[0] + '0.0.1'
+      rev_string = '0'
     revision = int(rev_string)
     return (ebuild_no_rev, ebuild_no_version, revision)
 
 
 class EBuildStableMarker(object):
   """Class that revs the ebuild and commits locally or pushes the change."""
 
   def __init__(self, ebuild):
     self._ebuild = ebuild
 
@@ skipping 49 matching lines @@
     old_ebuild_path = self._ebuild.ebuild_path
     diff_cmd = ['diff', '-Bu', old_ebuild_path, new_ebuild_path]
     if 0 == RunCommand(diff_cmd, exit_code=True, redirect_stdout=True,
                        redirect_stderr=True, print_cmd=gflags.FLAGS.verbose):
       os.unlink(new_ebuild_path)
       return False
     else:
       _Print('Adding new stable ebuild to git')
       _SimpleRunCommand('git add %s' % new_ebuild_path)
 
-      _Print('Removing old ebuild from git')
-      _SimpleRunCommand('git rm %s' % old_ebuild_path)
+      if self._ebuild.is_stable:
+        _Print('Removing old ebuild from git')
+        _SimpleRunCommand('git rm %s' % old_ebuild_path)
+
       return True
 
   def CommitChange(self, message):
     """Commits current changes in git locally.
 
     This method will take any changes from invocations to RevEBuild
     and commits them locally in the git repository that contains os.pwd.
 
     Args:
         message: the commit string to write when committing to git.
@@ skipping 65 matching lines @@
           raise
 
       if revved_packages:
         _CleanStalePackages(gflags.FLAGS.board, revved_packages)
       else:
         work_branch.Delete()
 
 
 if __name__ == '__main__':
   main(sys.argv)