From a615d19df88eb2e989316b480519161945dbc7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Nov 2018 21:34:48 +0100 Subject: RPM: merge redhat directory with master branch --- redhat/build/is_latest_package_built.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'redhat/build/is_latest_package_built.sh') diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 5f9a442a7..2054957e4 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -10,13 +10,13 @@ RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" # If package version contains a "~": it's a pre-release if [ "${BUILT/\~/}" != "${BUILT}" ]; then if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi # Nominal case: no "~" caracter else - if [ "${TARBALL%-*}" = "${BUILT%-*}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then + echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi fi -- cgit v1.2.3