From: joey Date: Sun, 26 Aug 2007 17:38:17 +0000 (+0000) Subject: * Fix a bug in unlockwiki intorduced last version that made it crash ikiwiki X-Git-Tag: 2.6.1~2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ab8125d62aa8fe26ad3f0771d2a8af580ca89564 * 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 a89d9c252..18a518f3f 100644 --- 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 d7373109e..4cba4c7df 100644 --- 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 Sun, 26 Aug 2007 13:30:31 -0400 + -- Joey Hess Sun, 26 Aug 2007 13:37:14 -0400 ikiwiki (2.6) unstable; urgency=low