diff options
| -rw-r--r-- | IkiWiki/Plugin/monotone.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 05c5a514d..c717ceefb 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -228,7 +228,7 @@ sub read_certs ($$) { 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, diff --git a/debian/changelog b/debian/changelog index eb8248804..491e07a4a 100644 --- 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. + * 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 |