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.

diff --git a/ChangeLog b/ChangeLog
index 6577d3e20715211a7148528ea29741f0381379b3..749ad915a315bdc17543cf459aea0213ead3b6f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-03  Jim Meyering  <meyering@redhat.com>
 
+       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.
+
        update-copyright: adjust test to match changed code
        * tests/test-update-copyright.sh: Change test's expected output
        to match new actual output.

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index c278f6a889214ce434d5bd0a0796befb573d1af0..c33767342988ed65c2522f37e00b92ed61e600c3 100755 (executable)
--- 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"