gitlog-to-changelog: don't malfunction when name contains %-directive

* build-aux/gitlog-to-changelog (main): Don't let a %-directive
in a name string cause trouble.  E.g., with a user name of "%s",
gitlog-to-changelog would fail with "Missing argument in sprintf at..."

diff --git a/ChangeLog b/ChangeLog
index 9624612..b65842a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-30  Jim Meyering  <meyering@redhat.com>
+
+       gitlog-to-changelog: don't malfunction when name contains %-directive
+       * build-aux/gitlog-to-changelog (main): Don't let a %-directive
+       in a name string cause trouble.  E.g., with a user name of "%s",
+       gitlog-to-changelog would fail with "Missing argument in sprintf at..."
+
 2011-12-30  Gary V. Vaughan  <gary@gnu.org>
 
        gitlog-to-changelog: Copyright-paperwork-exempt: yes == (tiny change)

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 3142cca..c3434a9 100755 (executable)
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2011-12-30 17:43'; # UTC
+my $VERSION = '2011-12-30 17:48'; # 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
@@ -255,8 +255,8 @@ sub parse_amend_file($)
       my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
                   ? '  (tiny change)' : '');
 
-      my $date_line = sprintf "%s  $2$tiny\n",
-        strftime ("%F", localtime ($1));
+      my $date_line = sprintf "%s  %s$tiny\n",
+        strftime ("%F", localtime ($1)), $2;
 
       my @coauthors = grep /^Co-authored-by:.*$/, @line;
       # Omit meta-data lines we've already interpreted.