fall back from YAML::Any to just YAML

[ikiwiki.git] / IkiWiki / Setup / Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index ba9192faf6f29ceb4fbb1f4a944de4b41bce3bd6..8ad44eb4afab294114ad1dad17f21c915794904a 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,17 +5,23 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
-use YAML;
 
 sub loaddump ($$) {
        my $class=shift;
        my $content=shift;
 
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;
+       die $@ if $@;
        IkiWiki::Setup::merge(Load($content));
 }
 
 sub gendump ($@) {
        my $class=shift;
+       
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;
+       die $@ if $@;
 
        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
@@ -35,7 +41,7 @@ sub dumpline ($$$$) {
        my $dump=Dump({$key => $value});
        chomp $dump;
        if (length $prefix) {
-               $dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+               $dump=join("\n", map { $prefix.$_ } split(/\n/, $dump));
        }
        return $dump;
 }