diff options
| author | Paula McMaw <paula@puppet.com> | 2017-05-10 11:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 11:00:48 +0100 |
| commit | 18620765d5a732a87214c8ac6e21ddf00b25ec83 (patch) | |
| tree | 65b67776a89d9dd640c6fada8266a233bfe7e95d /lib/puppet | |
| parent | 052d55b046706b6d68b69ac91e8d688009b3fdc1 (diff) | |
| parent | 51fd72ca4accb2760a364d65dfe6f9b672f68d83 (diff) | |
Merge pull request #776 from puppetlabs/release
Merge back 4.17.0
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/parser/functions/defined_with_params.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/ensure_packages.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb index 7f1fe93..e0d4e37 100644 --- a/lib/puppet/parser/functions/defined_with_params.rb +++ b/lib/puppet/parser/functions/defined_with_params.rb @@ -29,7 +29,7 @@ ENDOFDOC # Workaround for PE-20308 if reference.is_a?(String) type_name, title = Puppet::Resource.type_and_title(reference, nil) - type = Puppet::Type.type(type_name) + type = Puppet::Pops::Evaluator::Runtime3ResourceSupport.find_resource_type_or_class(find_global_scope, type_name) elsif reference.is_a?(Puppet::Resource) type = reference.resource_type title = reference.title diff --git a/lib/puppet/parser/functions/ensure_packages.rb b/lib/puppet/parser/functions/ensure_packages.rb index 17942b8..034f997 100644 --- a/lib/puppet/parser/functions/ensure_packages.rb +++ b/lib/puppet/parser/functions/ensure_packages.rb @@ -36,6 +36,7 @@ third argument to the ensure_resource() function. Puppet::Parser::Functions.function(:ensure_resource) packages.each { |package_name| + raise(Puppet::ParseError, 'ensure_packages(): Empty String provided for package name') if package_name.length == 0 if !findresource("Package[#{package_name}]") function_ensure_resource(['package', package_name, defaults ]) end |