urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve messages

master
joey 2007-05-21 03:00:45 +00:00
parent 10017feaec
commit ee843c7523
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki.pm
View File

@ -689,7 +689,6 @@ sub lockwiki (;$) { #{{{
error("wiki is locked; waited $wait seconds without lock being freed (possible stuck process or stale lock?)");
}
else {
debug("wiki is locked");
return 0;
}
}

6
IkiWiki/Plugin/aggregate.pm
View File

@ -33,8 +33,10 @@ sub getopt () { #{{{
sub checkconfig () { #{{{
if ($config{aggregate} && ! ($config{post_commit} &&
IkiWiki::commit_hook_enabled())) {
# don't wait for the lock
IkiWiki::lockwiki(0) || exit 1;
if (! IkiWiki::lockwiki(0)) {
debug("wiki is locked by another process, not aggregating");
exit 1;
}
loadstate();
IkiWiki::loadindex();