17119: rename ContentsOptions to GroupContentsOptions.

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

diff --git a/build/run-library.sh b/build/run-library.sh
index 9efc8028b51f395d4e344bcd34dfb6489cb1374c..513e8624ee723d769514a2194f2a19e7e291bf26 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -621,6 +621,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