fix back-compat with old Net::OpenID

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

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index c7ff1988e850e9e04f3055d21d7018cff5e27234..8ad44eb4afab294114ad1dad17f21c915794904a 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -10,7 +10,8 @@ sub loaddump ($$) {
        my $class=shift;
        my $content=shift;
 
-       eval q{use YAML};
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;
        die $@ if $@;
        IkiWiki::Setup::merge(Load($content));
 }
@@ -18,7 +19,8 @@ sub loaddump ($$) {
 sub gendump ($@) {
        my $class=shift;
        
-       eval q{use YAML};
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;
        die $@ if $@;
 
        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
@@ -39,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;
 }