commit 5d2671442a5a09ec0ba335aab1c4e859d9cb610f
author Alex Klein <saklein@chromium.org> Mon Sep 10 11:33:32 2018 -0600
committer chrome-bot <chrome-bot@chromium.org> Tue Sep 11 00:40:54 2018 -0700
tree 7f126a3dda653458ff46429abe40204e7795dec4
parent 00fec7fc93c626e0bf3c0a1340b91660fade9fff

run_chroot_version_hooks: removing unused arguments.

In preparation for porting the script to python, unused arguments
are being removed to confirm their non-use before the transition.

BUG=chromium:874988
TEST=manual, precq

Change-Id: I555837b1c2c9d159e5e6709e619a820de7110c25
Reviewed-on: https://chromium-review.googlesource.com/1216806
Commit-Ready: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

run_chroot_version_hooks

diff --git a/run_chroot_version_hooks b/run_chroot_version_hooks
index fc95ebc..40a95cf 100755
--- a/run_chroot_version_hooks
+++ b/run_chroot_version_hooks
@@ -15,12 +15,8 @@
 # May not be run as root.
 assert_not_root_user
 
-DEFINE_string version "" \
-  "Assume current chroot version is this."
 DEFINE_boolean init_latest "${FLAGS_FALSE}" \
   "Create the version file with the latest version if it doesn't exist"
-DEFINE_boolean skipfirst "${FLAGS_FALSE}" \
-  "Skip the first upgrade. This may be dangerous."
 
 FLAGS "$@" || exit 1
 
@@ -34,21 +30,6 @@
 
 ######################################################################
 
-# Sanity checks:
-if [ -n "${FLAGS_version}" ] && \
-    ( [ "${FLAGS_skipfirst}" == "${FLAGS_TRUE}" ] || \
-    [ "${FLAGS_init_latest}" == "${FLAGS_TRUE}" ] ); then
-  error "The option --version cannot be combined with either"
-  error "--skipfirst or --init_latest."
-  exit 1
-fi
-
-if [ "${FLAGS_skipfirst}" == "${FLAGS_TRUE}" ] &&
-    [ "${FLAGS_init_latest}" == "${FLAGS_TRUE}" ]; then
-  error "--skipfirst and --init_latest cannot be combined."
-  exit 1
-fi
-
 # Latest version is the version of last upgrade.d file.
 # Name format is ${number}_${short_description}
 # Versions must be -n sorted, that is, the first continuous sequence
@@ -81,33 +62,6 @@
   exit 0
 fi
 
-if [ "${FLAGS_skipfirst}" == "${FLAGS_TRUE}" ]; then
-  if [ "${CHROOT_VERSION}" -lt "${LATEST_VERSION}" ]; then
-    # if the new one is latest, this becomes noop
-    CHROOT_VERSION=$(expr ${CHROOT_VERSION} + 1)
-    update_version "${CHROOT_VERSION}"
-  else
-    error "Nothing to skip"
-    exit 1
-  fi
-fi
-
-if [ -n "${FLAGS_version}" ]; then
-  # Check if it's a number.
-  if ! [ "${FLAGS_version}" -ge "0" ] &> /dev/null; then
-    error "Trying to force invalid version: ${FLAGS_version}"
-    exit 1
-  fi
-
-  if [ "${FLAGS_version}" -gt "${LATEST_VERSION}" ]; then
-    error "Forcing nonexistant version: ${FLAGS_version}"
-    exit 1
-  fi
-
-  CHROOT_VERSION="${FLAGS_version}"
-fi
-
-
 if [ "${LATEST_VERSION}" -gt "${CHROOT_VERSION}" ]; then
   info "Old chroot version (${CHROOT_VERSION}) found, running upgrade hooks"