[ARVADOS] updated: 1.1.1-139-g905283a

[Git user]

Summary of changes:
 build/run-build-packages-one-target.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

       via  905283aa36b36d51c2c4376489cd97b34b488104 (commit)
      from  070fed19a16ca8466d2bc9b11d6fe3a7438a3aa6 (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 905283aa36b36d51c2c4376489cd97b34b488104
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Dec 6 09:25:50 2017 -0500

    12721: Handle --build-version 1.2.3-4-5 (v="1.2.3-4", iter="5")
    
    ...using the debian version string rules (the last hyphen is the
    version-iteration separator).
    
    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 aa8d15b..f2e5147 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -86,7 +86,12 @@ while [ $# -gt 0 ]; do
             test_packages=1
             ;;
         --build-version)
-            ARVADOS_BUILDING_VERSION="$2"
+            if ! [[ "$2" =~ (.*)-(.*) ]]; then
+                echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?"
+                exit 1
+            fi
+            ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}"
+            ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}"
             shift
             ;;
         --)
@@ -101,16 +106,7 @@ done
 
 set -e
 
-if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
-    IFS=- read ARVADOS_BUILDING_VERSION ARVADOS_BUILDING_ITERATION <<EOF
-$ARVADOS_BUILDING_VERSION
-EOF
-    if [[ -z "$ARVADOS_BUILDING_ITERATION" ]]; then
-        echo >&2 "FATAL: version does not include an iteration. Try --build-version ${ARVADOS_BUILDING_VERSION}-1"
-        exit 1
-    fi
-fi
-
+echo "build version='$ARVADOS_BUILDING_VERSION', package iteration='$ARVADOS_BUILDING_ITERATION'"
 
 if [[ -n "$test_packages" ]]; then
     if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then

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


hooks/post-receive
--