From 1a72bafa5df03718bb1c328f3d64078dc5e70feb Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 30 Aug 2018 13:50:33 +0200 Subject: osmo-release.sh: Add checks to help avoid libversion debian major mismatch Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 --- osmo-release.sh | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/osmo-release.sh b/osmo-release.sh index 26ebd337..4d4d080b 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -8,9 +8,19 @@ if [ "z$REL" = "z" ]; then fi ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" +ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" -BUMPVER=`command -v bumpversion` +libversion_to_deb_major() { + libversion="$1" + current="$(echo "$libversion" | cut -d ":" -f 1)" + #revision="$(echo "$libversion" | cut -d ":" -f 2)" + age="$(echo "$libversion" | cut -d ":" -f 3)" + major="$(expr "$current" - "$age")" + echo "$major" +} +BUMPVER=`command -v bumpversion` +GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` @@ -35,7 +45,34 @@ if [ "z$LIBVERS" != "z" ]; then echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi - + if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2) + major="$(libversion_to_deb_major "$libversion")" + file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" + if [ "z$file_matches" = "z0" ]; then + echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + exit 1 + elif [ "z$file_matches" = "z1" ]; then + echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + fi + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi + fi if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- cgit v1.2.3