From e04f9e4823208e2d8a48ecc25fdf5152ed09ae77 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 21 Dec 2009 15:10:40 -0800 Subject: Code smell reductions These are a grab-bag of code simplification changes I made in the process of figuring out what was going on with #2881; they should all be absolutely behavior neutral. --- lib/puppet/network/client/resource.rb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'lib/puppet/network/client') diff --git a/lib/puppet/network/client/resource.rb b/lib/puppet/network/client/resource.rb index bc4a8e53f..ad3210603 100644 --- a/lib/puppet/network/client/resource.rb +++ b/lib/puppet/network/client/resource.rb @@ -27,25 +27,12 @@ class Puppet::Network::Client::Resource < Puppet::Network::Client def describe(type, name, retrieve = false, ignore = false) Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name] text = @driver.describe(type, name, retrieve, ignore, "yaml") - - object = nil - if @local - object = text - else - object = YAML::load(Base64.decode64(text)) - end - - return object + @local ? text : YAML::load(Base64.decode64(text)) end def list(type, ignore = false, base = false) bucket = @driver.list(type, ignore, base, "yaml") - - unless @local - bucket = YAML::load(Base64.decode64(bucket)) - end - - return bucket + @local ? bucket : YAML::load(Base64.decode64(bucket)) end end -- cgit