[ARVADOS] updated: 1.1.0-62-g8d79144

Git user git at public.curoverse.com
Mon Oct 16 12:08:02 EDT 2017


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

       via  8d791446b9b741eceb7c1cc2c76d324bb09c3d4a (commit)
      from  f14c8033e51806185ec85e462aef26c04526e4c4 (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 8d791446b9b741eceb7c1cc2c76d324bb09c3d4a
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Oct 16 13:07:53 2017 -0300

    12389: try --exclude opt/rh/python33
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index ac99b2c..87ca70d 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -466,15 +466,14 @@ fpm_build () {
   for i in "${fpm_depends[@]}"; do
     COMMAND_ARR+=('--depends' "$i")
   done
-
-  if [[ rpm = "$FORMAT" ]]; then
-    COMMAND_ARR+=('--exclude opt/rh/python33') 
-  fi
   
   for i in "${fpm_exclude[@]}"; do
     COMMAND_ARR+=('--exclude' "$i")
   done
 
+  if [[ rpm = "$FORMAT" ]]; then
+    COMMAND_ARR+=("--exclude opt/rh/python33") 
+  fi
   # Append remaining function arguments directly to fpm's command line.
   for i; do
     COMMAND_ARR+=("$i")

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list