* Fix a bug in unlockwiki intorduced last version that made it crash ikiwiki

  if it wasn't locked when called. This is known to break post-commit
  emails.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a89d9c2529190b3c94c265e1f740f0412545db50..18a518f3f57ba06c7fdb4942e90cd13af4a1d882 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -774,7 +774,8 @@ sub lockwiki (;$) { #{{{
 } #}}}
 
 sub unlockwiki () { #{{{
-       return close($wikilock);
+       return close($wikilock) if $wikilock;
+       return;
 } #}}}
 
 my $commitlock;
@@ -800,7 +801,8 @@ sub disable_commit_hook () { #{{{
 } #}}}
 
 sub enable_commit_hook () { #{{{
-       return close($commitlock);
+       return close($commitlock) if $commitlock;
+       return;
 } #}}}
 
 sub loadindex () { #{{{

diff --git a/debian/changelog b/debian/changelog
index d7373109ef62b1c4c64081a7c4b28fffb67bfae4..4cba4c7df9ea2286637927625a50d540df893e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ikiwiki (2.7) UNRELEASED; urgency=low
+ikiwiki (2.6.1) UNRELEASED; urgency=low
 
   * Fix bug when blogging by cgi, introduced in last version.
+  * Fix a bug in unlockwiki intorduced last version that made it crash ikiwiki
+    if it wasn't locked when called. This is known to break post-commit
+    emails.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 26 Aug 2007 13:30:31 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 26 Aug 2007 13:37:14 -0400
 
 ikiwiki (2.6) unstable; urgency=low