[ARVADOS] updated: 2.1.0-57-g1cfce1d81

[Git user]

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

       via  1cfce1d817cc7c55735ccacacf9ef271ea126bec (commit)
      from  0a1c47884b83135c13bbcf565a2325f0b0583903 (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 1cfce1d817cc7c55735ccacacf9ef271ea126bec
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Jan 22 12:29:07 2021 -0500

    Make sure that our Python 3 based packages conflict with the older
    Python 2 based ones.
    
    No issue #
    
    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 c595bbfde..0aa178e9a 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -634,6 +634,10 @@ fpm_build_virtualenv () {
   LICENSE_STRING=`grep license $WORKSPACE/$PKG_DIR/setup.py|cut -f2 -d=|sed -e "s/[',\\"]//g"`
   COMMAND_ARR+=('--license' "$LICENSE_STRING")
 
+  if [[ "$FORMAT" != "rpm" ]]; then
+    COMMAND_ARR+=('--conflicts' "python-$PKG")
+  fi
+
   if [[ "$DEBUG" != "0" ]]; then
     COMMAND_ARR+=('--verbose' '--log' 'info')
   fi

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


hooks/post-receive
--