[ARVADOS] updated: 1.1.0-65-g71320ab

Git user git at public.curoverse.com
Mon Oct 16 12:31:57 EDT 2017


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

       via  71320abf79a7672ffd5fd24ae4fd1ddce280f862 (commit)
      from  3eabfe84b71e9837d4cd102aade9f8d9b02ce751 (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 71320abf79a7672ffd5fd24ae4fd1ddce280f862
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Oct 16 13:31:34 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 1ad3d23..465b152 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -418,9 +418,6 @@ fpm_build () {
       )
   fi
 
-  if [[ rpm = "$FORMAT" ]]; then
-    COMMAND_ARR+=('--exclude opt/rh/python33') 
-  fi
   # Append --depends X and other arguments specified by fpm-info.sh in
   # the package source dir. These are added last so they can override
   # the arguments added by this script.
@@ -474,6 +471,10 @@ fpm_build () {
     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