diff options
author | duritong <peter.meier+github@immerda.ch> | 2013-03-20 13:53:42 -0700 |
---|---|---|
committer | duritong <peter.meier+github@immerda.ch> | 2013-03-20 13:53:42 -0700 |
commit | 57d9f3125bafaf3aebc228f0c718d1b104c35a4e (patch) | |
tree | 1bdcb33b8c40fe5c98f7034f4be6aa32451dd028 | |
parent | 27775313728aa85d8c127f7d37fccd97054fe965 (diff) | |
parent | 02bbc22223f53d979c1ab5724e26aa2ac4c22c7a (diff) |
Merge pull request #2 from amfranz/master
Compatibility with latest Puppet version (v3.1.0)
-rw-r--r-- | lib/puppet/parser/functions/trocla_set.rb | 4 | ||||
-rw-r--r-- | lib/puppet/util/trocla_helper.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/trocla_set.rb b/lib/puppet/parser/functions/trocla_set.rb index 5b6079a..c3c9b49 100644 --- a/lib/puppet/parser/functions/trocla_set.rb +++ b/lib/puppet/parser/functions/trocla_set.rb @@ -50,9 +50,7 @@ trocla, for example via cli. 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, "You need rubygems to use Trocla") unless Puppet.features.rubygems? - - require 'rubygems' + require 'trocla' result = (trocla=Trocla.new(configfile)).set_password(key,format,value) diff --git a/lib/puppet/util/trocla_helper.rb b/lib/puppet/util/trocla_helper.rb index 58ccf9c..64ef859 100644 --- a/lib/puppet/util/trocla_helper.rb +++ b/lib/puppet/util/trocla_helper.rb @@ -25,9 +25,7 @@ module Puppet::Util::TroclaHelper 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? - require 'rubygems' require 'trocla' has_options ? Trocla.new(configfile).send(trocla_func, key, format, options) : Trocla.new(configfile).send(trocla_func, key, format) |