From f1697a4720541a84e581fee2513c84a8dc26ff93 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 8 Aug 2018 17:10:03 -0400 Subject: [PATCH] 13931: Fix "don't rebuild packages that already exist" logic Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- build/run-library.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/run-library.sh b/build/run-library.sh index c5a73cbe35..6ee57a4be5 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -60,7 +60,7 @@ version_from_git() { declare $(format_last_commit_here "git_ts=%ct git_hash=%h") ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)" echo "$ARVADOS_BUILDING_VERSION" -} +} nohash_version_from_git() { if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then @@ -273,12 +273,15 @@ test_package_presence() { repo_subdir=${pkgname:0:1} fi - repo_pkg_list=$(curl -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/) + repo_pkg_list=$(curl -s -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/) echo ${repo_pkg_list} |grep -q ${complete_pkgname} - if [ $? -eq 0 ]; then + if [ $? -eq 0 ] ; then echo "Package $complete_pkgname exists, not rebuilding!" curl -o ./${complete_pkgname} http://apt.arvados.org/pool/${D}/main/${repo_subdir}/${complete_pkgname} return 1 + elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then + echo "Package $complete_pkgname exists, not rebuilding!" + return 1 else echo "Package $complete_pkgname not found, building" return 0 -- 2.39.5