[ARVADOS] updated: 2.1.0-234-gc16c3f3e2

Git user git at public.arvados.org
Wed Dec 23 02:16:58 UTC 2020


Summary of changes:
 build/run-library.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  c16c3f3e2d875f254bbc0bf86ebfdb97af1cc28d (commit)
      from  533f0c79e26d71f9ea24a82f7857ede35aa4d12a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c16c3f3e2d875f254bbc0bf86ebfdb97af1cc28d
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Dec 22 21:16:41 2020 -0500

    Fix detection of packages that were already built.
    
    refs #17218
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 17ad557d8..9efc8028b 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -347,11 +347,11 @@ test_package_presence() {
         repo_subdir=${pkgname:0:1}
       fi
 
-      repo_pkg_list=$(curl -s -o - http://apt.arvados.org/${D}/pool/${D}-dev/main/${repo_subdir}/${pkgname}/)
+      repo_pkg_list=$(curl -s -o - http://apt.arvados.org/${D}/pool/main/${repo_subdir}/${pkgname}/)
       echo "${repo_pkg_list}" |grep -q ${full_pkgname}
       if [ $? -eq 0 ] ; then
         echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!"
-        curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" http://apt.arvados.org/${D}/pool/${D}-dev/main/${repo_subdir}/${pkgname}/${full_pkgname}
+        curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" http://apt.arvados.org/${D}/pool/main/${repo_subdir}/${pkgname}/${full_pkgname}
         return 1
       elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then
         echo "Package $full_pkgname exists, not rebuilding!"

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list