[ARVADOS] updated: 88e0523b21ceab4bf56a4b5b130a92662c96e002

[Git user]

Summary of changes:
 build/build.list            | 2 +-
 build/run-build-packages.sh | 5 +++--
 build/run-library.sh        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

       via  88e0523b21ceab4bf56a4b5b130a92662c96e002 (commit)
       via  69f7fc66538ffa970bcf3b4169993ba1a146703f (commit)
      from  735ffe841b0142d663c5f40b40ec55db2191b2b0 (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 88e0523b21ceab4bf56a4b5b130a92662c96e002
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jan 17 21:35:54 2017 -0500

    10858: Equivalent commit for 10881: Add python-futures as explicit
    cwltest dependency and bump iteration.
    
    refs #10858

diff --git a/build/build.list b/build/build.list
index 4b60e42..554bde4 100644
--- a/build/build.list
+++ b/build/build.list
@@ -39,6 +39,6 @@ centos7|html5lib|0.9999999|2|python|all
 centos7|keepalive|0.5|2|python|all
 all|lockfile|0.12.2|2|python|all|--epoch 1
 all|ruamel.yaml|0.13.7|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
-all|cwltest|1.0.20160907111242|2|python|all
+all|cwltest|1.0.20160907111242|3|python|all|--depends 'python-futures >= 3.0.5'
 all|rdflib-jsonld|0.4.0|2|python|all
 all|futures|3.0.5|2|python|all
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index e38c9a9..7840b3c 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -519,6 +519,7 @@ while read -r line || [[ -n "$line" ]]; do
   pkgtype=${arr[4]}
   arch=${arr[5]}
   extra=${arr[6]}
+  declare -a 'extra_arr=('"$extra"')'
 
   if [[ "$FORMAT" == "rpm" ]]; then
     if [[ "$arch" == "all" ]]; then
@@ -557,7 +558,7 @@ while read -r line || [[ -n "$line" ]]; do
                 "python$PYTHON2_VERSION" setup.py $DASHQ_UNLESS_DEBUG egg_info build
                 chmod -R go+rX .
                 set +e
-                fpm_build . "$outname" "" "$pkgtype" "$version" --iteration "$iteration" $extra
+                fpm_build . "$outname" "" "$pkgtype" "$version" --iteration "$iteration" "${extra_arr[@]}"
                 # The upload step uses the package timestamp to determine
                 # if it is new.  --no-clobber plays nice with that.
                 mv --no-clobber "$outname"*.$FORMAT "$WORKSPACE/packages/$TARGET"
@@ -574,7 +575,7 @@ while read -r line || [[ -n "$line" ]]; do
       *)
           test_package_presence $outname $version $pkgtype $iteration $arch
           if [[ "$?" == "0" ]]; then
-            fpm_build "$name" "$outname" "" "$pkgtype" "$version" --iteration "$iteration" $extra
+            fpm_build "$name" "$outname" "" "$pkgtype" "$version" --iteration "$iteration" "${extra_arr[@]}"
           fi
           ;;
   esac

commit 69f7fc66538ffa970bcf3b4169993ba1a146703f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jan 17 21:34:34 2017 -0500

    Fix rpm architecture in the test_package_presence function. Expand on
    comment.
    
    refs #10858

diff --git a/build/run-library.sh b/build/run-library.sh
index 677c645..a13470b 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -199,7 +199,7 @@ test_package_presence() {
       deb_architecture="amd64"
 
       if [[ "$pkgtype" =~ ^(python|python3)$ ]]; then
-        rpm_architecture="all"
+        rpm_architecture="noarch"
         deb_architecture="all"
       fi
 
@@ -208,7 +208,7 @@ test_package_presence() {
         deb_architecture="all"
       fi
 
-      # These packages have binary components
+      # These python packages have binary components
       if [[ "$pkgname" =~ (ruamel|ciso|pycrypto|pyyaml) ]]; then
         rpm_architecture="x86_64"
         deb_architecture="amd64"

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


hooks/post-receive
--