fall back from YAML::Any to just YAML

for portabilty to old YAML in Debian stable that lacks the former.

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 58cba4222e95517248853991bc3ebaa4e808e1bd..8ad44eb4afab294114ad1dad17f21c915794904a 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -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",

diff --git a/ikiwiki.in b/ikiwiki.in
index 7028bdb7d99d098175ed772060946bfc24023a4c..a8343ed0f99bb1e44b98e7ba4757c48693a45376 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -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);
                        },