Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 6bf20f480d523ad5144dc6d1b61ec03d1f0118b5..8edd7126b0e33c2a8c07bfa329be72b997d0d81d 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -35,7 +35,9 @@ sub dumpline ($$$$) {
        
        eval q{use YAML::XS};
        die $@ if $@;
        
        eval q{use YAML::XS};
        die $@ if $@;

+       no warnings 'once';

        $YAML::XS::QuoteNumericStrings=0;
        $YAML::XS::QuoteNumericStrings=0;

+       use warnings;

 
        my $dump=decode_utf8(Dump({$key => $value}));
        $dump=~s/^---\n//; # yaml header, we don't want
 
        my $dump=decode_utf8(Dump({$key => $value}));
        $dump=~s/^---\n//; # yaml header, we don't want