From: Stephen Gran Date: Sun, 31 May 2015 15:28:15 +0000 (+0100) Subject: KCODE is gone X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=80b0cc62b8ca834194819f486a7f2bf1ba23f61b;p=mirror%2Fdsa-puppet.git KCODE is gone Signed-off-by: Stephen Gran --- diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb index b55204ac8..ca0d2957c 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb @@ -8,8 +8,6 @@ module Puppet::Parser::Functions parser = Puppet::Parser::Parser.new(environment) parser.watch_file(yamlfile) - $KCODE = 'utf-8' - ans = {"name" => "unknown"} yaml = YAML.load_file(yamlfile) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb index b38f5d56a..f53014dee 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb @@ -42,7 +42,6 @@ module Puppet::Parser::Functions } require 'yaml' - $KCODE = 'utf-8' yaml = YAML.load_file(yamlfile) ret = {}