summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/util/trocla_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/trocla_helper.rb b/lib/puppet/util/trocla_helper.rb
index 9a41c0e..58ccf9c 100644
--- a/lib/puppet/util/trocla_helper.rb
+++ b/lib/puppet/util/trocla_helper.rb
@@ -16,6 +16,7 @@ module Puppet::Util::TroclaHelper
key = args[0] || raise(Puppet::ParseError, "You need to pass at least a key as an argument!")
format = args[1] || 'plain'
options = args[2] || {}
+
if options.is_a?(String)
require 'yaml'
options = YAML.load(options)
@@ -23,7 +24,7 @@ module Puppet::Util::TroclaHelper
configfile = File.join(File.dirname(Puppet.settings[:config]), "troclarc.yaml")
- raise(Puppet::ParseError, "Trocla config file #{configfile} not readable") unless File.exist?(configfile)
+ raise(Puppet::ParseError, "Trocla config file #{configfile} is not readable") unless File.exist?(configfile)
raise(Puppet::ParseError, "You need rubygems to use Trocla") unless Puppet.features.rubygems?
require 'rubygems'