X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a33764685ef7fa9578b255e78ad2ed77abc1ded..64297a2306c851b2fd34d5fbf1087c207337ac3a:/build/run-build-packages-one-target.sh?ds=sidebyside diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index 905af1cbc6..298bd1cc9f 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -139,16 +139,14 @@ fi 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 + CREATEREPO="$(command -v createrepo createrepo_c | tail -n1)" + if [[ -z "$CREATEREPO" ]]; then echo >&2 - echo >&2 "Error: please install createrepo. E.g. sudo apt-get install createrepo" + echo >&2 "Error: please install createrepo. E.g. sudo apt install createrepo-c" echo >&2 exit 1 fi - set -e - createrepo $WORKSPACE/packages/$TARGET + "$CREATEREPO" $WORKSPACE/packages/$TARGET fi if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then