diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-01-03 11:50:43 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-01-03 11:50:43 +0100 |
| commit | 55b6628590f922e9f47da60a3fc7a2030f80cddf (patch) | |
| tree | 80e29ffb4d7c183c1fcf4e3bceb6d712e156df86 /build-aux/git-version-gen | |
| parent | 1a48af730c9cc5b019104b03861a2f597d3b76e3 (diff) | |
| download | gnulib-55b6628590f922e9f47da60a3fc7a2030f80cddf.tar.gz | |
git-version-gen: include command name in one more diagnostic
* build-aux/git-version-gen: When the required .tarball-version file
was missing or unreadable, you might see the diagnostic from "cat",
but no trace of the name of the invoking script. Now, you still see
the diagnostic from cat, but also get one from "git-version-gen: ".
Inspired by a patch from Bruce Korb.
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index c278f6a889..c337673429 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2010-10-13.20; # UTC +scriptversion=2011-01-03.10; # UTC # Copyright (C) 2007-2011 Free Software Foundation, Inc. # @@ -85,14 +85,14 @@ v= # then try "git describe", then default. if test -f $tarball_version_file then - v=`cat $tarball_version_file` || exit 1 + v=`cat $tarball_version_file` || v= case $v in *$nl*) v= ;; # reject multi-line output [0-9]*) ;; *) v= ;; esac test -z "$v" \ - && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 fi if test -n "$v" |