[ARVADOS] updated: 1.1.1-136-gf763868

[Git user]

Summary of changes:
 build/run-build-packages-one-target.sh | 8 +++++++-
 build/run-library.sh                   | 9 ++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

       via  f763868dd1202328576e4b393b71bb584190ee39 (commit)
       via  0c2d4c32d12de5d1d4b37db1b0ddfb97628ac33e (commit)
      from  c3fa3f1d3b71f606cbf39c23ae3a53c682b5c851 (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 f763868dd1202328576e4b393b71bb584190ee39
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Dec 5 14:31:48 2017 -0500

    12721: Support package iterations via --version 1.2.3-5
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index f2a28ec..cf60b5e 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -86,7 +86,8 @@ while [ $# -gt 0 ]; do
             test_packages=1
             ;;
         --version)
-            ARVADOS_BUILDING_VERSION="$2"; shift
+            ARVADOS_BUILDING_VERSION="$2"
+            shift
             ;;
         --)
             if [ $# -gt 1 ]; then
@@ -100,6 +101,10 @@ done
 
 set -e
 
+IFS=- read ARVADOS_BUILDING_VERSION ARVADOS_BUILDING_ITERATION <<EOF
+$ARVADOS_BUILDING_VERSION
+EOF
+
 if [[ -n "$test_packages" ]]; then
     if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
         createrepo $WORKSPACE/packages/$TARGET
@@ -213,6 +218,7 @@ else
     if docker run --rm \
         "${docker_volume_args[@]}" \
         --env ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION" \
+        --env ARVADOS_BUILDING_ITERATION="$ARVADOS_BUILDING_ITERATION" \
         --env ARVADOS_DEBUG=$ARVADOS_DEBUG \
         --env "ONLY_BUILD=$ONLY_BUILD" \
         "$IMAGE" $COMMAND
diff --git a/build/run-library.sh b/build/run-library.sh
index da607a5..51678e6 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -10,10 +10,10 @@
 # older packages.
 LICENSE_PACKAGE_TS=20151208015500
 
-if [[ -z $ARVADOS_BUILDING_VERSION ]]; then
+if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
     RAILS_PACKAGE_ITERATION=8
 else
-    RAILS_PACKAGE_ITERATION=
+    RAILS_PACKAGE_ITERATION="$ARVADOS_BUILDING_ITERATION"
 fi
 
 debug_echo () {
@@ -163,6 +163,7 @@ package_go_binary() {
 
 default_iteration() {
     if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
+        echo "$ARVADOS_BUILDING_ITERATION"
         return
     fi
     local package_name="$1"; shift
@@ -220,11 +221,7 @@ test_package_presence() {
         return 1
     fi
 
-    if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
-        iteration=""
-    elif [[ "$iteration" == "" ]]; then
-        iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
-    fi
+    iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
 
     if [[ "$arch" == "" ]]; then
       rpm_architecture="x86_64"

commit 0c2d4c32d12de5d1d4b37db1b0ddfb97628ac33e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Dec 5 10:57:21 2017 -0500

    12721: Fix python pkg iteration overridde.
    
    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 d6860eb..da607a5 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -220,8 +220,10 @@ test_package_presence() {
         return 1
     fi
 
-    if [[ "$iteration" == "" ]]; then
-      iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
+    if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
+        iteration=""
+    elif [[ "$iteration" == "" ]]; then
+        iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
     fi
 
     if [[ "$arch" == "" ]]; then

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


hooks/post-receive
--