Add 9999 revving logic to cros_mark_all_as_stable.

cros_mark_all_as_stable

 #!/bin/bash
 
 # 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.
 
 # Wrapper scripts around cros_mark_as_stable that marks all packages as stable
 # that have CROS_WORKON_COMMIT that is different than the current HEAD commit
 # of the corresponding git repository.
 
@@ skipping 44 matching lines @@
 
 # For each package, compares the head commit id to the commit id in the ebuild.
 # If they do not match, add the package and its commit id into ${PACKAGE_LIST}
 # and ${COMMIT_ID_LIST}
 for package in ${PACKAGES}; do
   if package_is_blacklisted ${package}; then
     info "${package} blacklisted, skipping"
     continue
   fi
   ebuild_path=$(${EQUERYCMD} which ${package}) || continue
+  # Get 9999 ebuild path to see if it got changed.
+  ebuild_9999_path=$(ACCEPT_KEYWORDS=~* ${EQUERYCMD} which ${package}) \
+      || continue
   # Sets ${CROS_WORKON_SRCDIR} from the ebuild.
   eval $(${EBUILDCMD} ${ebuild_path} info) &> /dev/null || continue
   head_commit=$( cd "${CROS_WORKON_SRCDIR}" &&\
     bash -c "${GRAB_HEAD_COMMIT_CMD}" ) || continue
   egit_commit=$(\
     eval echo $(grep CROS_WORKON_COMMIT ${ebuild_path} | cut -f 2 -d '=')) ||\
       echo "No CROS_WORKON_COMMIT found in ${ebuild_path}"
   if [[ ${head_commit} != ${egit_commit} ]] && \
-    [ -n "${head_commit}" ]; then
+      [ -n "${head_commit}" ]; then
     info\
       "HEAD ${head_commit} != CROS_WORKON_COMMIT ${egit_commit} for ${package}"
     PACKAGE_LIST="${PACKAGE_LIST} ${package}"
     COMMIT_ID_LIST="${COMMIT_ID_LIST} ${head_commit}"
   elif [[ ${head_commit}  = ${egit_commit} ]]; then
-    info "Commit id's match for ${package}"
+    info "Commit id's match for ${package}, checking for 9999 ebuild change."
+    # egrep succeeds if there are important differences between the ebuilds.
+    if diff "${ebuild_path}" "${ebuild_9999_path}" | \
+        egrep -v "KEYWORDS|CROS_WORKON_COMMIT|^---|^[<>]\ *$|^[0-9]"; then
+      info "Detected 9999 ebuild change for ${package}."
+      PACKAGE_LIST="${PACKAGE_LIST} ${package}"
+      COMMIT_ID_LIST="${COMMIT_ID_LIST} ${egit_commit}"
+    fi
   fi
 done
 
 if [ -n "${PACKAGE_LIST}" ] ; then
   info "Candidate package list ${PACKAGE_LIST}"
   info "With commit id list ${COMMIT_ID_LIST}"
 
   ./cros_mark_as_stable --board ${FLAGS_board} -p "${PACKAGE_LIST}" \
     -i "${COMMIT_ID_LIST}" -t ${FLAGS_tracking_branch} commit  || \
     die "Could not mark all packages as stable"
 else
   info "No candidate packages to be marked"
 fi