[ARVADOS] updated: 1.1.0-275-g8b83ea9

Git user git at public.curoverse.com
Tue Nov 28 10:34:13 EST 2017


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

       via  8b83ea945daa12ef457bf2fdfae997f689cd0634 (commit)
      from  1cd90faab84116bdcd9c8852e2e031d3336d297f (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 8b83ea945daa12ef457bf2fdfae997f689cd0634
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Tue Nov 28 12:34:01 2017 -0300

    12673: add buildNumber as iteration number everywhere
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 3826b13..f1fa69a 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -169,14 +169,14 @@ default_iteration() {
     local package_name="$1"; shift
     local package_version="$1"; shift
     local package_type="$1"; shift
-    local iteration=1
-    if [[ $package_version =~ ^0\.1\.([0-9]{14})(\.|$) ]] && \
-           [[ ${BASH_REMATCH[1]} -le $LICENSE_PACKAGE_TS ]]; then
-        iteration=2
-    fi
+    local iteration=$RAILS_PACKAGE_ITERATION
+#    if [[ $package_version =~ ^0\.1\.([0-9]{14})(\.|$) ]] && \
+#           [[ ${BASH_REMATCH[1]} -le $LICENSE_PACKAGE_TS ]]; then
+#        iteration=2
+#    fi
     if [[ $package_type =~ ^python ]]; then
       # Fix --iteration for #9242.
-      iteration=2
+      iteration=$RAILS_PACKAGE_ITERATION
     fi
     echo $iteration
 }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list