[ARVADOS-DEV] updated: 17d02ba1aa5c25c101ae1a887f18e9dc5d2bb139

git at public.curoverse.com git at public.curoverse.com
Fri Jan 29 16:15:44 EST 2016


Summary of changes:
 jenkins/run-library.sh | 4 ++++
 1 file changed, 4 insertions(+)

       via  17d02ba1aa5c25c101ae1a887f18e9dc5d2bb139 (commit)
      from  a1ca4978b7e4e6d917c50c64c3bf5e527690a7e4 (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 17d02ba1aa5c25c101ae1a887f18e9dc5d2bb139
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jan 29 16:15:41 2016 -0500

    Add distinct fpm_exclude so it shows up in the right place on the fpm command
    line.  refs #8008

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index eb2384a..83e0ea0 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -244,6 +244,7 @@ fpm_build () {
   # the arguments added by this script.
   declare -a fpm_args=()
   declare -a fpm_depends=()
+  declare -a fpm_exclude=()
   if [[ -d "$PACKAGE_DIR" ]]; then
       FPM_INFO="$PACKAGE_DIR/fpm-info.sh"
   else
@@ -256,6 +257,9 @@ fpm_build () {
   for i in "${fpm_depends[@]}"; do
     COMMAND_ARR+=('--depends' "$i")
   done
+  for i in "${fpm_exclude[@]}"; do
+    COMMAND_ARR+=('--exclude' "$i")
+  done
 
   # Append remaining function arguments directly to fpm's command line.
   for i; do

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list