diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-09 16:53:37 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-09 16:53:37 -0800 |
| commit | 8cfc8f195481bbca7c38a415ef8ba11bd20503a6 (patch) | |
| tree | 2a63ebb9c0241d8d0b14893a83c1e48b0dd1b4ca /lib/puppet/parser | |
| parent | 05f2cfa4c7179183c2e721ec4ebe3854782817c3 (diff) | |
| parent | 285c4cc4b056b9c4990738c3d479d1a8993cf959 (diff) | |
| download | puppet-8cfc8f195481bbca7c38a415ef8ba11bd20503a6.tar.gz puppet-8cfc8f195481bbca7c38a415ef8ba11bd20503a6.tar.xz puppet-8cfc8f195481bbca7c38a415ef8ba11bd20503a6.zip | |
Merge branch 'ticket/2.6.next/5392' into 2.6.next
* ticket/2.6.next/5392:
(#5392) Give a better error when realizing a non-existant resource
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/ast/collection.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/parser/ast/collection.rb b/lib/puppet/parser/ast/collection.rb index ef36b7143..565b83195 100644 --- a/lib/puppet/parser/ast/collection.rb +++ b/lib/puppet/parser/ast/collection.rb @@ -16,6 +16,7 @@ class Puppet::Parser::AST str, code = query && query.safeevaluate(scope) resource_type = scope.find_resource_type(@type) + fail "Resource type #{@type} doesn't exist" unless resource_type newcoll = Puppet::Parser::Collector.new(scope, resource_type.name, str, code, self.form) scope.compiler.add_collection(newcoll) @@ -26,10 +27,10 @@ class Puppet::Parser::AST params = @override.collect { |param| param.safeevaluate(scope) } newcoll.add_override( :parameters => params, - :file => @file, - :line => @line, - :source => scope.source, - :scope => scope + :file => @file, + :line => @line, + :source => scope.source, + :scope => scope ) end |