[ARVADOS] created: 2.1.0-1181-gf67c3d18e
Git user
git at public.arvados.org
Wed Aug 11 19:31:16 UTC 2021
at f67c3d18e58d4d6f331763a9728f1ef1595558d7 (commit)
commit f67c3d18e58d4d6f331763a9728f1ef1595558d7
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 e404c0bc7..22bb06587 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
--
More information about the arvados-commits
mailing list