13383: Implement EmptyTrashWorkers in azure and filesystem backends.

[arvados.git] / build / run-library.sh

diff --git a/build/run-library.sh b/build/run-library.sh
index 2e441e4f48cb0ffeae887af244db11fff5aeb5f4..fb4df6a79215ea3cfa86f0bd5cfc6c9233fa8233 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: AGPL-3.0
@@ -50,7 +50,7 @@ version_from_git() {
         return
     fi
 
-    local git_ts git_hash
+    local git_ts git_hash prefix
     if [[ -n "$1" ]] ; then
         prefix="$1"
     else
@@ -277,7 +277,7 @@ test_package_presence() {
         fi
 
         repo_pkg_list=$(curl -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/)
-        echo ${repo_pkg_list} |grep -q ${pkgname}
+        echo ${repo_pkg_list} |grep -q ${complete_pkgname}
         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}
@@ -391,6 +391,8 @@ fpm_build () {
           python=python2.7
           set -- "$@" --python-bin python2.7 \
               --python-easyinstall "$EASY_INSTALL2" \
+              --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
+              --prefix "$PYTHON2_PREFIX" \
               --python-install-lib "$PYTHON2_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \
@@ -405,6 +407,8 @@ fpm_build () {
           python=python3
           set -- "$@" --python-bin python3 \
               --python-easyinstall "$EASY_INSTALL3" \
+              --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
+              --prefix "$PYTHON3_PREFIX" \
               --python-install-lib "$PYTHON3_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \