Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebuild for jessie-backports
[git.ikiwiki.info.git]
/
IkiWiki
/
Setup
/
Yaml.pm
diff --git
a/IkiWiki/Setup/Yaml.pm
b/IkiWiki/Setup/Yaml.pm
index c7ff1988e850e9e04f3055d21d7018cff5e27234..8edd7126b0e33c2a8c07bfa329be72b997d0d81d 100644
(file)
--- a/
IkiWiki/Setup/Yaml.pm
+++ b/
IkiWiki/Setup/Yaml.pm
@@
-5,22
+5,20
@@
package IkiWiki::Setup::Yaml;
use warnings;
use strict;
use IkiWiki;
use warnings;
use strict;
use IkiWiki;
+use Encode;
sub loaddump ($$) {
my $class=shift;
my $content=shift;
sub loaddump ($$) {
my $class=shift;
my $content=shift;
- eval q{use YAML};
+ eval q{use YAML
::XS
};
die $@ if $@;
die $@ if $@;
- IkiWiki::Setup::merge(Load(
$content
));
+ IkiWiki::Setup::merge(Load(
encode_utf8($content)
));
}
sub gendump ($@) {
my $class=shift;
}
sub gendump ($@) {
my $class=shift;
- eval q{use YAML};
- die $@ if $@;
-
"# IkiWiki::Setup::Yaml - YAML formatted setup file",
"#",
(map { "# $_" } @_),
"# IkiWiki::Setup::Yaml - YAML formatted setup file",
"#",
(map { "# $_" } @_),
@@
-35,11
+33,17
@@
sub dumpline ($$$$) {
my $type=shift;
my $prefix=shift;
my $type=shift;
my $prefix=shift;
- $YAML::UseHeader=0;
- my $dump=Dump({$key => $value});
+ eval q{use YAML::XS};
+ die $@ if $@;
+ no warnings 'once';
+ $YAML::XS::QuoteNumericStrings=0;
+ use warnings;
+
+ my $dump=decode_utf8(Dump({$key => $value}));
+ $dump=~s/^---\n//; # yaml header, we don't want
chomp $dump;
if (length $prefix) {
chomp $dump;
if (length $prefix) {
- $dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+ $dump=join("
\n
", map { $prefix.$_ } split(/\n/, $dump));
}
return $dump;
}
}
return $dump;
}