[ARVADOS-DEV] updated: 0fbece8ea4acf263da8bc312ba3451c1adb7ea43

[git at public.curoverse.com]

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

       via  0fbece8ea4acf263da8bc312ba3451c1adb7ea43 (commit)
      from  9fa534460eaa10ac16d1de355e45898517306ec5 (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 0fbece8ea4acf263da8bc312ba3451c1adb7ea43
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 21 10:21:45 2015 -0400

    3793: Fix how python3 fpm arguments are added.
    
    The previous code would add arguments such that they could be
    interpreted as the package version.  Avoid this by adding arguments
    after we're done consuming positional arguments.
    
    Refs #3793.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 95a507a..bb0877e 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -149,18 +149,18 @@ build_and_scp_deb () {
   # The type of source package.  Passed to fpm -s.  Default "python".
   PACKAGE_TYPE=${1:-python}
   shift
+  # Optional: the package version number.  Passed to fpm -v.
+  VERSION=$1
+  shift
 
+  # fpm does not actually support a python3 package type.  Instead we recognize
+  # it as a convenience shortcut to add several necessary arguments to
+  # fpm's command line later, after we're done handling positional arguments.
   if [ "python3" = "$PACKAGE_TYPE" ]; then
-      # fpm does not actually support this package type.  Instead we recognize
-      # it as a convenience shortcut to add several necessary arguments to
-      # fpm's command line later.
       PACKAGE_TYPE=python
       set -- "$@" --python-bin python3 --python-easyinstall easy_install3 \
           --python-package-name-prefix python3 --depends python3
   fi
-  # Optional: the package version number.  Passed to fpm -v.
-  VERSION=$1
-  shift
 
   declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "deb" "-x" "usr/local/lib/python2.7/dist-packages/tests")
 

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


hooks/post-receive
--