From: Simon Josefsson Date: Fri, 31 Jan 2025 23:24:27 +0000 (+0100) Subject: announce-gen: Deal with 'guix --version'. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=61c40358bc9b09fa0985747064c48f81f607039a;p=gnulib.git announce-gen: Deal with 'guix --version'. * build-aux/announce-gen (get_tool_versions): Handle git commit --versions. Improve error message. --- diff --git a/ChangeLog b/ChangeLog index fb649ea68c..2f0e8d34e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-02-01 Simon Josefsson + + announce-gen: Deal with 'guix --version'. + * build-aux/announce-gen (get_tool_versions): Handle git commit + --versions. Improve error message. + 2025-01-28 Collin Funk doc: Document version-etc, version-etc-fsf, and argp-version-etc. diff --git a/build-aux/announce-gen b/build-aux/announce-gen index fc3787bf62..8e75608cbd 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -35,7 +35,7 @@ eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2024-12-28 18:31'; # UTC +my $VERSION = '2025-01-31 23:21'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -375,16 +375,16 @@ sub get_tool_versions ($$) # Assume that the last "word" on the first line of # 'tool --version' output is the version string. my ($first_line, undef) = split ("\n", `$t --version`); - if ($first_line =~ /.* (\d[\w.-]+)$/) + if ($first_line =~ /.* ([a-f\d][\w.-]+)$/) { $t = ucfirst $t; push @tool_version_pair, "$t $1"; } else { + warn "$t: unexpected --version output:\n$first_line"; defined $first_line and $first_line = ''; - warn "$t: unexpected --version output\n:$first_line"; $fail = 1; } }