[ARVADOS] updated: 1.1.0-60-g90ce834

Git user git at public.curoverse.com
Mon Oct 16 11:55:42 EDT 2017


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

       via  90ce8348745a2705ba2dc042567f697ef321246a (commit)
      from  961f484fc16730ba664eb9bc6c473d4cb30e6ba2 (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 90ce8348745a2705ba2dc042567f697ef321246a
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Oct 16 12:55:33 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 72d6009..9b4571d 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -389,7 +389,6 @@ fpm_build () {
   # remove lingering dirs.
   if [[ rpm = "$FORMAT" ]]; then
     COMMAND_ARR+=('--rpm-auto-add-directories') 
-    COMMAND_ARR+=('--exclude opt/rh/python33')
   fi
 
   if [[ "${DEBUG:-0}" != "0" ]]; then
@@ -480,6 +479,10 @@ fpm_build () {
 
   COMMAND_ARR+=("$PACKAGE")
 
+  if [[ rpm = "$FORMAT" ]]; then
+    COMMAND_ARR+=('--exclude opt/rh/python33') 
+  fi
+
   debug_echo -e "\n${COMMAND_ARR[@]}\n"
 
   FPM_RESULTS=$("${COMMAND_ARR[@]}")

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list