monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte)

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 05c5a514dc3f22c6b58de298b007c16a9208d89f..c717ceefb71b2ffc24c432711400a7548aa03a40 100644 (file)
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -228,7 +228,7 @@ sub read_certs ($$) {
        my @ret;
 
        my $line = $results[0];
        my @ret;
 
        my $line = $results[0];

-       while ($line =~ m/\s+key\s"(.*?)"\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) {
+       while ($line =~ m/\s+key\s["\[](.*?)[\]"]\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) {

                push @ret, {
                        key => $1,
                        signature => $2,
                push @ret, {
                        key => $1,
                        signature => $2,

diff --git a/debian/changelog b/debian/changelog
index eb8248804ec1c5fd1259a66598b33c0afb837c3c..491e07a4aa4774fe25d7b63bd5200e99f428cca6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
   * Improve javascript onload handling.
   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
     Requena.
   * Improve javascript onload handling.

+  * monotone: Deal with format change in version 0.45.
+    (Thanks, Richard Levitte)

 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500