summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-24 16:12:35 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-03-24 16:12:35 -0400
commiteb06a0135511fc5b5422f07ca5344ce114402a61 (patch)
tree65edf3e91440adbde5a2a63b6379961e2fd65753
parenta76206d4809364eaab288df45b126893887e46f4 (diff)
use perl YAML for dumping
Only it understands $YAML::UseHeader
-rw-r--r--IkiWiki/Setup/Yaml.pm8
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 5 deletions
diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 8ad44eb4a..8b876e297 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -19,10 +19,6 @@ sub loaddump ($$) {
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 { "# $_" } @_),
@@ -37,7 +33,11 @@ sub dumpline ($$$$) {
my $type=shift;
my $prefix=shift;
+ eval q{use YAML::Old};
+ eval q{use YAML} if $@;
+ die $@ if $@;
$YAML::UseHeader=0;
+
my $dump=Dump({$key => $value});
chomp $dump;
if (length $prefix) {
diff --git a/debian/changelog b/debian/changelog
index e7499b6f2..12dd0dc02 100644
--- 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.