diff options
Diffstat (limited to 'lib/puppet/network/client')
| -rw-r--r-- | lib/puppet/network/client/ca.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/network/client/report.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/network/client/runner.rb | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/lib/puppet/network/client/ca.rb b/lib/puppet/network/client/ca.rb index 2b96cd681..1460e4d6e 100644 --- a/lib/puppet/network/client/ca.rb +++ b/lib/puppet/network/client/ca.rb @@ -25,9 +25,7 @@ class Puppet::Network::Client::CA < Puppet::Network::Client begin cert, cacert = @driver.getcert(csr.to_pem) rescue => detail - if Puppet[:trace] - puts detail.backtrace - end + puts detail.backtrace if Puppet[:trace] raise Puppet::Error.new("Certificate retrieval failed: #{detail}") end diff --git a/lib/puppet/network/client/report.rb b/lib/puppet/network/client/report.rb index 9bd61de2e..f4a9cdaa7 100644 --- a/lib/puppet/network/client/report.rb +++ b/lib/puppet/network/client/report.rb @@ -2,9 +2,7 @@ class Puppet::Network::Client::Report < Puppet::Network::Client @handler = Puppet::Network::Handler.handler(:report) def initialize(hash = {}) - if hash.include?(:Report) - hash[:Report] = self.class.handler.new - end + hash[:Report] = self.class.handler.new if hash.include?(:Report) super(hash) end @@ -14,9 +12,7 @@ class Puppet::Network::Client::Report < Puppet::Network::Client def report(transreport) report = YAML.dump(transreport) - unless self.local - report = CGI.escape(report) - end + report = CGI.escape(report) unless self.local # Now send the report file = nil diff --git a/lib/puppet/network/client/runner.rb b/lib/puppet/network/client/runner.rb index 5806dd343..c6ba328b4 100644 --- a/lib/puppet/network/client/runner.rb +++ b/lib/puppet/network/client/runner.rb @@ -2,9 +2,7 @@ class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient self.mkmethods def initialize(hash = {}) - if hash.include?(:Runner) - hash[:Runner] = self.class.handler.new() - end + hash[:Runner] = self.class.handler.new() if hash.include?(:Runner) super(hash) end |
