[ARVADOS] updated: 1.1.1-138-g57c0733

[Git user]

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

       via  57c07330f31183d81092bf1f8e3072a83723faf0 (commit)
      from  d8971ff1526d4698ee00f9fca864beed5a9d7498 (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 57c07330f31183d81092bf1f8e3072a83723faf0
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Dec 6 02:40:17 2017 -0500

    12721: Fix python package iteration and rails fpm invocation.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 51678e6..eb271ce 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -148,7 +148,7 @@ package_go_binary() {
 
     go get -ldflags "-X main.version=${version}" "git.curoverse.com/arvados.git/$src_path"
 
-    declare -a switches=()
+    local -a switches=()
     systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
     if [[ -e "${systemd_unit}" ]]; then
         switches+=(
@@ -221,7 +221,9 @@ test_package_presence() {
         return 1
     fi
 
-    iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
+    if [[ "$iteration" == "" || -n "$ARVADOS_BUILDING_VERSION" ]]; then
+        iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
+    fi
 
     if [[ "$arch" == "" ]]; then
       rpm_architecture="x86_64"

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


hooks/post-receive
--