commit aafdcbd56fbed1fe310c55a19408b9492e1b8ef1
author Rob Barnes <robbarnes@google.com> Tue Jul 21 07:42:37 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Jul 21 20:40:53 2020 +0000
tree 1b2707f69de5bb5d5a949cb435d63870d0bd463f
parent 81c72e1feb453a9c640f491c945e0b08ba42cd92

update_program_fw: Add --verify to repo upload

Without --verify, repo upload will fail if the user has not already
selected to 'always' run pre upload hooks. -y isn't enough.

BUG=None
TEST=Run script

Change-Id: Idbb6b24042d66a9e5c12a5d50edeeea0af35fccf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2309959
Commit-Queue: Rob Barnes <robbarnes@google.com>
Tested-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Andrew McRae <amcrae@chromium.org>

contrib/update_program_fw

diff --git a/contrib/update_program_fw b/contrib/update_program_fw
index 6d08d1c..207af55 100755
--- a/contrib/update_program_fw
+++ b/contrib/update_program_fw
@@ -352,7 +352,7 @@
 BUG=${FLAGS_bug}
 TEST=${FLAGS_test}
 EOF
-    if ! repo upload -y "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.output" 2>&1 ;then
+    if ! repo upload -y --verify "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.output" 2>&1 ;then
       cat  "${TEMPDIR}/upload.output"
       abort "repo upload failed"
     fi
@@ -390,7 +390,7 @@
 BUG=${FLAGS_bug}
 TEST=${FLAGS_test}
 EOF
-    if ! repo upload -y "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.${PROJ}.output" 2>&1 ;then
+    if ! repo upload -y --verify "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.${PROJ}.output" 2>&1 ;then
       cat  "${TEMPDIR}/upload.${PROJ}.output"
       abort "repo upload failed"
     fi
@@ -415,7 +415,7 @@
   if [[ -n "${PROGRAM_CL}" ]]; then
     cd "${PROGDIR}"
     amend "${PROG_CQD}"
-    if ! repo upload -y "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.amend.output" 2>&1 ;then
+    if ! repo upload -y --verify "--ht=${BRANCH}" --cbr . > "${TEMPDIR}/upload.amend.output" 2>&1 ;then
       cat  "${TEMPDIR}/upload.amend.output"
       abort "repo upload failed"
     fi
@@ -509,7 +509,7 @@
   for DIR in "${PROJ_DIRS[@]}"; do
     cd "${DIR}"
     amend "${CQD}"
-    if ! repo upload -y --cbr . > "${TEMPDIR}/cqd.output" 2>&1 ;then
+    if ! repo upload -y --verify --cbr . > "${TEMPDIR}/cqd.output" 2>&1 ;then
       cat  "${TEMPDIR}/cqd.output"
       abort "repo upload failed"
     fi