Merge branch 'master' into 8465-stderr-redirection

[arvados.git] / build / run-build-packages.sh

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 245be759800033067f40b9d421ec591624af9041..37e963b6474eea96e939015a86e09aaf03a2d13b 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -112,6 +112,9 @@ case "$TARGET" in
     ubuntu1404)
         FORMAT=deb
         ;;
+    ubuntu1604)
+        FORMAT=deb
+        ;;
     centos7)
         FORMAT=rpm
         PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
@@ -257,7 +260,7 @@ handle_python_package
     arvados_src_version="$(version_from_git)"
 
     cd $WORKSPACE/packages/$TARGET
-    test_package_presence arvados-src $arvados_src_version src
+    test_package_presence arvados-src $arvados_src_version src ""
 
     if [[ "$?" == "0" ]]; then
       cd "$WORKSPACE"
@@ -519,6 +522,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 +561,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 +578,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