summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-10-13 17:33:17 +0200
committerBruno Haible <bruno@clisp.org>2019-10-13 17:33:17 +0200
commit8f41f19184ce8ae3ff2f7335fe064da826b76356 (patch)
treeea884a1f028be2e6453da2e3b20d74db37960745
parentd38175bd98a69c3c6070033d70d110281267cece (diff)
downloadgnulib-8f41f19184ce8ae3ff2f7335fe064da826b76356.tar.gz
gnulib-8f41f19184ce8ae3ff2f7335fe064da826b76356.tar.bz2
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.
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/git-version-gen4
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 <bruno@clisp.org>
+
+ 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 <bruno@clisp.org>
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

Return to:

Send suggestions and report system problems to the System administrator.