[ARVADOS] updated: 1.1.0-61-gf14c803
Git user
git at public.curoverse.com
Mon Oct 16 12:03:27 EDT 2017
Summary of changes:
build/run-library.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
via f14c8033e51806185ec85e462aef26c04526e4c4 (commit)
from 90ce8348745a2705ba2dc042567f697ef321246a (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 f14c8033e51806185ec85e462aef26c04526e4c4
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Oct 16 13:03:16 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 9b4571d..ac99b2c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -466,6 +466,11 @@ 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
@@ -479,10 +484,6 @@ 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