diff options
Diffstat (limited to 'lib/puppet/resource')
-rw-r--r-- | lib/puppet/resource/catalog.rb | 4 | ||||
-rw-r--r-- | lib/puppet/resource/type.rb | 6 | ||||
-rw-r--r-- | lib/puppet/resource/type_collection.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index 12bbffcc5..365aa0709 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -252,7 +252,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph # Clear the cache to encourage the GC buckets.clear - return result + result end # Make sure all of our resources are "finished". @@ -584,7 +584,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph result.add_class(*self.classes) result.tag(*self.tags) - return result + result end def virtual_not_exported?(resource) diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index b1188491a..572a4f8c4 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -98,7 +98,7 @@ class Puppet::Resource::Type def match(string) return string.to_s.downcase == name unless name_is_regex? - return @name =~ string + @name =~ string end # Add code from a new instance to our code. @@ -162,7 +162,7 @@ class Puppet::Resource::Type def name return @name unless @name.is_a?(Regexp) - return @name.source.downcase.gsub(/[^-\w:.]/,'').sub(/^\.+/,'') + @name.source.downcase.gsub(/[^-\w:.]/,'').sub(/^\.+/,'') end def name_is_regex? @@ -257,7 +257,7 @@ class Puppet::Resource::Type def evaluate_parent_type(resource) return unless klass = parent_type and parent_resource = resource.scope.compiler.catalog.resource(:class, klass.name) || resource.scope.compiler.catalog.resource(:node, klass.name) parent_resource.evaluate unless parent_resource.evaluated? - return parent_scope(resource.scope, klass) + parent_scope(resource.scope, klass) end def evaluate_ruby_code(resource, scope) diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb index 4dbf753be..39883ac67 100644 --- a/lib/puppet/resource/type_collection.rb +++ b/lib/puppet/resource/type_collection.rb @@ -131,7 +131,7 @@ class Puppet::Resource::TypeCollection return r end - return loader.load_until(namespaces, name) { find(namespaces, name, type) } + loader.load_until(namespaces, name) { find(namespaces, name, type) } end def find_node(name) |