* Fix file pruning code to work if ikiwiki is run with "." as the srcdir.

master
Joey Hess 2007-12-10 15:12:56 -05:00
parent 64d550b14a
commit 58049e97c1
2 changed files with 3 additions and 2 deletions

View File

@ -1067,10 +1067,10 @@ sub file_pruned ($$) { #{{{
require File::Spec;
my $file=File::Spec->canonpath(shift);
my $base=File::Spec->canonpath(shift);
$file =~ s#^\Q$base\E/*##;
$file =~ s#^\Q$base\E/+##;
my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
return $file =~ m/$regexp/;
return $file =~ m/$regexp/ && $file ne $base;
} #}}}
sub gettext { #{{{

1
debian/changelog vendored
View File

@ -17,6 +17,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
wiki rebuild each midnight.
* calendar: Work around block html parsing bug in markdown 1.0.1 by
enclosing the calendar in an extra div.
* Fix file pruning code to work if ikiwiki is run with "." as the srcdir.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500