projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a1c478
)
Make sure that our Python 3 based packages conflict with the older
author
Ward Vandewege <ward@curii.com>
Fri, 22 Jan 2021 17:29:07 +0000
(12:29 -0500)
committer
Ward Vandewege <ward@curii.com>
Fri, 22 Jan 2021 17:29:07 +0000
(12:29 -0500)
Python 2 based ones.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
build/run-library.sh
patch
|
blob
|
history
diff --git
a/build/run-library.sh
b/build/run-library.sh
index c595bbfdefe112bfd911a1bbf1b03955aec30d86..0aa178e9a42013d3bd70ad2b3d6aca6bce7eb252 100755
(executable)
--- 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