Merge branch '17947-centos7-package-conflict'

[arvados.git] / build / run-library.sh

diff --git a/build/run-library.sh b/build/run-library.sh
index e404c0bc7c1e801d8d6cc4bd1d17567bd6c184c7..22bb065872e357aae2db7fc0437203d949c452df 100755 (executable)
--- 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