[ARVADOS] updated: 2.2.1-17-g1275d744d

[Git user]

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

       via  1275d744db9177f16ffd71c76c5c567f6dfb9a9a (commit)
      from  5f86dc1c3ee1c2bced3b52f77a80f8d0b31236a0 (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 1275d744db9177f16ffd71c76c5c567f6dfb9a9a
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Aug 11 15:29:07 2021 -0400

    17947: the Arvados python3-* CentOS packages should conflict with the
           corresponding older rh-python36-* version.
    
    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 0c3cbde8d..51d2f35de 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -621,6 +621,11 @@ 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
+    # Make sure to conflict with the old rh-python36 packages we used to publish
+    COMMAND_ARR+=('--conflicts' "rh-python36-python-$PKG")
+  fi
+
   if [[ "$DEBUG" != "0" ]]; then
     COMMAND_ARR+=('--verbose' '--log' 'info')
   fi

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


hooks/post-receive
--