diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:53:13 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:53:29 -0700 |
| commit | 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac (patch) | |
| tree | 3c6495838d1b876528cb4522de3484c44749140d /lib/puppet/parser/ast/resource.rb | |
| parent | d5db8db116aff58215ab0feebd7ec02086040f51 (diff) | |
| parent | 0f56c1b02d40f1f8552d933dd78b24745937b137 (diff) | |
| download | puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.tar.gz puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.tar.xz puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.zip | |
Merge branch 'next'
This synchronizes the 2.7 master branch with 2.6.1RC2
Diffstat (limited to 'lib/puppet/parser/ast/resource.rb')
| -rw-r--r-- | lib/puppet/parser/ast/resource.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb index 1b063c984..0c58538d5 100644 --- a/lib/puppet/parser/ast/resource.rb +++ b/lib/puppet/parser/ast/resource.rb @@ -33,11 +33,12 @@ class Resource < AST::ResourceReference # This is where our implicit iteration takes place; if someone # passed an array as the name, then we act just like the called us # many times. + fully_qualified_type, resource_titles = scope.resolve_type_and_titles(type, resource_titles) + resource_titles.flatten.collect { |resource_title| exceptwrap :type => Puppet::ParseError do - - resource = Puppet::Parser::Resource.new( - type, resource_title, + resource = Puppet::Parser::Resource.new( + fully_qualified_type, resource_title, :parameters => paramobjects, :file => self.file, :line => self.line, |