12721: Merge branch 'master' into 12721-build-package-version

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --cc build/run-build-packages-one-target.sh
index f2e514736b2cf9d4846e7ffaaf33ca625b94ad07,0db305114e39cf3e77852457bcfc364ddb3fca7a..0e7e399a37f8ce4bb359b7946f8b81fd6e1dfff7
--- 1/build/run-build-packages-one-target.sh
--- 2/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@@ -106,10 -95,17 +106,19 @@@ don
  
  set -e
  
 +echo "build version='$ARVADOS_BUILDING_VERSION', package iteration='$ARVADOS_BUILDING_ITERATION'"
 +
  if [[ -n "$test_packages" ]]; then
      if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
+       set +e
+       /usr/bin/which createrepo >/dev/null
+       if [[ "$?" != "0" ]]; then
+               echo >&2
+               echo >&2 "Error: please install createrepo. E.g. sudo apt-get install createrepo"
+               echo >&2
+               exit 1
+       fi
+       set -e
          createrepo $WORKSPACE/packages/$TARGET
      fi
  

diff --cc build/run-build-packages.sh
Simple merge