From 8f41f19184ce8ae3ff2f7335fe064da826b76356 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 13 Oct 2019 17:33:17 +0200 Subject: [PATCH] git-version-gen: Allow 'snapshot' as .tarball-version contents. * build-aux/git-version-gen: Don't map non-numeric .tarball-version contents to the empty string. --- ChangeLog | 6 ++++++ build-aux/git-version-gen | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47575b06e8..877e275e75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-10-13 Bruno Haible + + git-version-gen: Allow 'snapshot' as .tarball-version contents. + * build-aux/git-version-gen: Don't map non-numeric .tarball-version + contents to the empty string. + 2019-10-12 Bruno Haible intprops tests: Fix compilation errors on HP-UX/ia64 with cc. diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 45b5656e6f..d855645ef0 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -142,11 +142,9 @@ then v=`cat $tarball_version_file` || v= case $v in *$nl*) v= ;; # reject multi-line output - [0-9]*) ;; - *) v= ;; esac test "x$v" = x \ - && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 + && echo "$0: WARNING: $tarball_version_file is damaged" 1>&2 fi if test "x$v" != x -- 2.39.5