]> git.proxmox.com Git - mirror_spl.git/commitdiff
Restrict release number to META version
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 29 May 2014 21:55:40 +0000 (14:55 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 30 May 2014 02:08:03 +0000 (19:08 -0700)
When creating packages in a git repository the release number
can be automatically set by 'git describe'.  This normally works
well but if your repository has newer tags which match the form
NAME-VERSION* the release may be incorrectly calculated.  To
prevent this the match patten has been restricted to NAME-VERSION.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
config/spl-meta.m4

index a51fa797eefb7f89e9eb0478dbfde37313f0a23a..e98cc2ea6378d5b247821d691f4faf1c3017264c 100644 (file)
@@ -57,7 +57,7 @@ AC_DEFUN([SPL_AC_META], [
 
                SPL_META_RELEASE=_SPL_AC_META_GETVAL([Release]);
                if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
-                       _match="${SPL_META_NAME}-${SPL_META_VERSION}*"
+                       _match="${SPL_META_NAME}-${SPL_META_VERSION}"
                        _alias=$(git describe --match=${_match} 2>/dev/null)
                        _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
                        if test -n "${_release}"; then