diff options
author | Joey Hess <joey@kitenet.net> | 2010-04-20 18:19:00 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-04-20 18:19:00 -0400 |
commit | 34e8c78c1c9bf65564c1a3086584158e5c3cc415 (patch) | |
tree | ba95100ac77e203def8c1529a9c128e85b8a7818 /IkiWiki.pm | |
parent | 59ceeb5621ae0ae2bcb7501c6ac0c7a06562a7cc (diff) | |
parent | 64946f91982d85bb301cc9241459939c657d0eb9 (diff) |
Merge branch 'master' into autotag
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index c22c75df8..adae5d8c1 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -356,7 +356,7 @@ sub getsetup () { }, wiki_file_prune_regexps => { type => "internal", - default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./, + default => [qr/(^|\/)\.\.(\/|$)/, qr/^\//, qr/^\./, qr/\/\./, qr/\.x?html?$/, qr/\.ikiwiki-new$/, qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//, qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//, @@ -1844,15 +1844,8 @@ sub deptype (@) { } my $file_prune_regexp; -sub file_pruned ($;$) { +sub file_pruned ($) { my $file=shift; - if (@_) { - require File::Spec; - $file=File::Spec->canonpath($file); - my $base=File::Spec->canonpath(shift); - return if $file eq $base; - $file =~ s#^\Q$base\E/+##; - } if (defined $config{include} && length $config{include}) { return 0 if $file =~ m/$config{include}/; |