diff options
| author | mh <mh@immerda.ch> | 2011-10-27 23:38:41 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-27 23:38:41 +0200 |
| commit | 716267086b88c4825e6f82e7121b3bc03f636202 (patch) | |
| tree | 0f3c98f8943523d1ae2f6c79af2d40946b406a75 /lib/puppet/util/trocla_helper.rb | |
| parent | abc6919245bca4c1965376fec4744df2329211a5 (diff) | |
| parent | 64205c93a957bafdfb255a991844f2d7744f11b5 (diff) | |
merge
Diffstat (limited to 'lib/puppet/util/trocla_helper.rb')
| -rw-r--r-- | lib/puppet/util/trocla_helper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/util/trocla_helper.rb b/lib/puppet/util/trocla_helper.rb index 374d538..58ccf9c 100644 --- a/lib/puppet/util/trocla_helper.rb +++ b/lib/puppet/util/trocla_helper.rb @@ -17,7 +17,12 @@ module Puppet::Util::TroclaHelper format = args[1] || 'plain' options = args[2] || {} - configfile = File.join(File.dirname(Puppet.settings[:config]), 'troclarc.yaml') + if options.is_a?(String) + require 'yaml' + options = YAML.load(options) + end + + configfile = File.join(File.dirname(Puppet.settings[:config]), "troclarc.yaml") 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? |