use perl YAML for dumping

Only it understands $YAML::UseHeader

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 8ad44eb4afab294114ad1dad17f21c915794904a..8b876e297527af0de21bb8e70d63e5ddcbfdd14e 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -19,10 +19,6 @@ sub loaddump ($$) {
 sub gendump ($@) {
        my $class=shift;
        
 sub gendump ($@) {
        my $class=shift;
        

-       eval q{use YAML::Any};
-       eval q{use YAML} if $@;
-       die $@ if $@;
-

        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
        (map { "# $_" } @_),
        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
        (map { "# $_" } @_),


@@ -37,7 +33,11 @@ sub dumpline ($$$$) {
        my $type=shift;
        my $prefix=shift;
        
        my $type=shift;
        my $prefix=shift;
        

+       eval q{use YAML::Old};
+       eval q{use YAML} if $@;
+       die $@ if $@;

        $YAML::UseHeader=0;
        $YAML::UseHeader=0;

+

        my $dump=Dump({$key => $value});
        chomp $dump;
        if (length $prefix) {
        my $dump=Dump({$key => $value});
        chomp $dump;
        if (length $prefix) {

diff --git a/debian/changelog b/debian/changelog
index e7499b6f2bd139920d33c78e746f0d657656168a..12dd0dc02bcc66b15afa04dafb5986cb70fb5965 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100320) UNRELEASED; urgency=low
+ikiwiki (3.20100324) UNRELEASED; urgency=low

 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.