X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9516ddc7158e077743a0daffb36e77a16a59c736..d3e236828617b778237b7ac9c91c62a25263e5c4:/build/run-library.sh?ds=sidebyside

diff --git a/build/run-library.sh b/build/run-library.sh
index 59a9e4f47d..1076095900 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -621,10 +621,6 @@ 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
@@ -664,6 +660,10 @@ fpm_build_virtualenv () {
     COMMAND_ARR+=('--depends' "$i")
   done
 
+  for i in "${fpm_depends[@]}"; do
+    COMMAND_ARR+=('--replaces' "python-$PKG")
+  done
+
   # make sure the systemd service file ends up in the right place
   # used by arvados-docker-cleaner
   if [[ -e "${systemd_unit}" ]]; then