Permalink
Browse files

Merge pull request #4 from catay/issue/3

Removed :json type from load_scope when parsing YAML format
  • Loading branch information...
2 parents 8b7e036 + fb88a3b commit ae4cfcc1a70743c5ab1018be193161de5d09eed1 @ripienaar committed Jun 13, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 bin/hiera
View
@@ -110,7 +110,7 @@ OptionParser.new do |opts|
opts.on("--yaml SCOPE", "-y", "YAML format file to load scope from") do |v|
begin
- options[:scope] = load_scope(v, :json)
+ options[:scope] = load_scope(v)
rescue Exception => e
STDERR.puts "Could not load YAML scope: #{e.class}: #{e}"
exit 1

0 comments on commit ae4cfcc

Please sign in to comment.