From e5730173854c41392eb5de07a07653efe22d18ce Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 9 Apr 2014 08:55:43 +0200 Subject: [PATCH] hooks/post-install/pkglint: fixed another issue in the shlib checks. --- common/hooks/post-install/99-pkglint.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/hooks/post-install/99-pkglint.sh b/common/hooks/post-install/99-pkglint.sh index 6f3e1a32f8..23f35da1b8 100644 --- a/common/hooks/post-install/99-pkglint.sh +++ b/common/hooks/post-install/99-pkglint.sh @@ -32,7 +32,12 @@ hook() { libname=${filename%.so*} _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g') _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g') - grep -E "^${_shlib}\.so(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" $mapshlibs | { \ + if [ "$rev" = "$filename" ]; then + _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" + else + _pattern="^${_shlib}\.so\.[0-9]+[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" + fi + grep -E "${_pattern}" $mapshlibs | { \ while read conflictFile conflictPkg; do found=1 conflictRev=${conflictFile#*.so.}