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

Check for existence off srcfile in add_autofile 

add_autofile has to have checks, whether to create the file, anyway, so this
will make things more consistent.

Correcter check for the result of verify_src_file().

Cosmetic rename of a variable $addfile to $autofile.
master
David Riebenbauer 2010-02-03 04:29:10 +01:00
parent da5d29f95f
commit a358d74bef
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki.pm
View File

@ -1897,9 +1897,14 @@ sub add_link ($$) {
}
sub add_autofile ($) {
my $addfile=shift;
my ($file,$page) = verify_src_file($addfile,$config{srcdir});
if ($page) {
my $autofile=shift;
if (srcfile($autofile, 1)) {
return 0;
}
my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
if (defined $file) {
push @autofiles, $file;
}
}

5
IkiWiki/Plugin/tag.pm
View File

@ -71,15 +71,14 @@ sub gentag ($) {
if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
$tagfile=~s/^\///;
return if (srcfile($tagfile,1));
return if (! add_autofile($tagfile));
debug(sprintf(gettext("creating tag page %s"), $tag));
my $template=template("autotag.tmpl");
$template->param(tag => $tag);
writefile($tagfile, $config{srcdir}, $template->output);
add_autofile("$config{srcdir}/$tagfile");
}
}