aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Setup
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-19 14:52:17 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-03-19 14:52:17 -0400
commitb1dade8d960ce7ccb549e5652d35a8e9dbccf5c6 (patch)
tree75852fed4ddd9f046eaedea7552d03342128b847 /IkiWiki/Setup
parent6dc6fe2f9bc6bcd532291c703a637d24dfe58956 (diff)
downloadikiwiki-b1dade8d960ce7ccb549e5652d35a8e9dbccf5c6.tar
ikiwiki-b1dade8d960ce7ccb549e5652d35a8e9dbccf5c6.tar.gz
allow multiple setup file types, and support safe parsing
Finally removed the last hardcoding of IkiWiki::Setup::Standard. Take the first "IkiWiki::Setup::*" in the setup file to define the setuptype, and remember that type to use in dumping later. (But it can be overridden using --set, etc.) Also, support setup file types that are not evaled.
Diffstat (limited to 'IkiWiki/Setup')
-rw-r--r--IkiWiki/Setup/Standard.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f7a322317..4022ff03c 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -82,8 +82,10 @@ sub dumpvalues ($@) {
return @ret;
}
-sub gendump ($) {
+sub gendump ($$) {
+ my $class=shift;
my $description=shift;
+
my %setup=(%config);
my @ret;