[ARVADOS] updated: 1.3.0-3131-g3ebf3b706

[Git user]

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

       via  3ebf3b7068dc55a8458ea12c01dee1e88a468b84 (commit)
      from  5dafff1ed428fc1018e0ced86e1a07406d7e57f5 (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 3ebf3b7068dc55a8458ea12c01dee1e88a468b84
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Sep 10 16:18:12 2020 -0400

    Bugfix: make sure that any fpm_args defined in fpm-info.sh get
    introduced at the correct position in the fpm argument list. This only
    affects non-Python packages (we already did the right thing for Python
    packages).
    
    refs #15348
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 528d69d99..df551455c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -704,6 +704,8 @@ fpm_build_virtualenv () {
 
   COMMAND_ARR+=(".")
 
+  debug_echo -e "\n${COMMAND_ARR[@]}\n"
+
   FPM_RESULTS=$("${COMMAND_ARR[@]}")
   FPM_EXIT_CODE=$?
 
@@ -827,13 +829,13 @@ fpm_build () {
     COMMAND_ARR+=('--exclude' "$i")
   done
 
+  COMMAND_ARR+=("${fpm_args[@]}")
+
   # Append remaining function arguments directly to fpm's command line.
   for i; do
     COMMAND_ARR+=("$i")
   done
 
-  COMMAND_ARR+=("${fpm_args[@]}")
-
   COMMAND_ARR+=("$PACKAGE")
 
   debug_echo -e "\n${COMMAND_ARR[@]}\n"

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


hooks/post-receive
--