summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-28 17:48:24 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-28 17:48:24 +0000
commita0653933d324f30838fe04d5f9aaab8b130014b2 (patch)
treeb8c1bd9ed42cf27dd6b5238e19020bf06d55e87d /IkiWiki
parent201e681d3413d93c99af614042d26ad9a74edfcf (diff)
* Add exclude option in setup files, works same as --exclude.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/tag.pm3
-rw-r--r--IkiWiki/Setup/Standard.pm3
2 files changed, 5 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 56bf17e2c..289b48b87 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,7 +34,8 @@ sub preprocess (@) { #{{{
$tags{$page} = [];
foreach my $tag (keys %params) {
- if (exists $IkiWiki::config{tagbase}) {
+ if (exists $IkiWiki::config{tagbase} &&
+ defined $IkiWiki::config{tagbase}) {
$tag=$IkiWiki::config{tagbase}."/".$tag;
}
push @{$tags{$page}}, $tag;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4082ca7af..b1418ae34 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,6 +30,9 @@ sub setup_standard {
}
delete $setup{disable_plugins};
}
+ if (exists $setup{exclude}) {
+ $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+ }
debug("generating wrappers..");
my @wrappers=@{$setup{wrappers}};