[ARVADOS] updated: 2.1.0-122-g9ebb1a7db

Git user git at public.arvados.org
Fri Nov 20 22:33:47 UTC 2020


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

       via  9ebb1a7db28380d2d3088371c93ac5b141dbdb35 (commit)
      from  9d755d7dc0df6975e8b46cbaac6867abefdd138f (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 9ebb1a7db28380d2d3088371c93ac5b141dbdb35
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Nov 20 17:31:50 2020 -0500

    Remove one more python2 remnant. This is a fix for the
    python3-arvados-cwl-runner package, it now installs /usr/bin/cwltool
    again.
    
    refs #15888
    
    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 1716cf370..a72aa3ad7 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -690,9 +690,9 @@ fpm_build_virtualenv () {
     done
   fi
 
-  # the python-arvados-cwl-runner package comes with cwltool, expose that version
-  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
-    COMMAND_ARR+=("usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
+  # the python3-arvados-cwl-runner package comes with cwltool, expose that version
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/")
   fi
 
   COMMAND_ARR+=(".")

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list