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

fall back from YAML::Any to just YAML 

for portabilty to old YAML in Debian stable that lacks the former.
master
Joey Hess 2010-03-24 14:53:32 -04:00
parent c64c4b9962
commit 3166479fe4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Setup/Yaml.pm
View File

@ -11,6 +11,7 @@ sub loaddump ($$) {
my $content=shift;
eval q{use YAML::Any};
eval q{use YAML} if $@;
die $@ if $@;
IkiWiki::Setup::merge(Load($content));
}
@ -19,6 +20,7 @@ sub gendump ($@) {
my $class=shift;
eval q{use YAML::Any};
eval q{use YAML} if $@;
die $@ if $@;
"# IkiWiki::Setup::Yaml - YAML formatted setup file",

1
ikiwiki.in
View File

@ -102,6 +102,7 @@ sub getconfig () {
die gettext("usage: --set-yaml var=value"), "\n";
}
eval q{use YAML::Any};
eval q{use YAML} if $@;
die $@ if $@;
$config{$var}=Load($val);
},