cvs log emits a timezone after the hour, at least here. Adjust date regexp

to handle that case.

diff --git a/cvslog2changelog.pl b/cvslog2changelog.pl
index 6f083ef3f2721bc27401496065afccd848f05e2a..1f8b3be01ae92d7d165232d4680ec5b31e7bc8e4 100644 (file)
--- a/cvslog2changelog.pl
+++ b/cvslog2changelog.pl
@@ -38,11 +38,11 @@ while (<>) {
        }
     } elsif ($_ =~ /^revision ([0-9.]*)/) {
        $change->{revision} = $1;
-    } elsif ($_ =~ /^date: ([^; ]*) ([^; ]*);  author: ([^;]*);/) {
+    } elsif ($_ =~ /^date: ([^; ]*) ([^; ]*)( \+[0-9]+)?;  author: ([^;]*);/) {
        $change->{date} = $1;
        $change->{hour} = $2;
-       $change->{author} = $Authors{$3} ? $Authors{$3} : $3;
-       $change->{committed} = $3;
+       $change->{author} = $Authors{$3} ? $Authors{$3} : $4;
+       $change->{committed} = $4;
     } elsif ($_ =~ /^From: (.*)$/) {
        $change->{author} = $1;
     } elsif ($change->{revision}) {