diff options
| author | Matt Wrock <matt@mattwrock.com> | 2015-12-15 13:26:08 -0800 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2015-12-15 13:26:08 -0800 |
| commit | 41bd0ba8e88522555e0dbef4ce8159d8d88d1582 (patch) | |
| tree | fe55dc558b8a34ef0b83a575acacbc86fb8680be | |
| parent | 09df8eea8bdbca4b7f1f0db43033d8d473860131 (diff) | |
| download | chef-mwrock/package.tar.gz | |
merge cleanupmwrock/package
| -rw-r--r-- | lib/chef/resource/windows_package.rb | 6 | ||||
| -rw-r--r-- | spec/functional/resource/windows_package_spec.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb index 7f70f876d0..7ccf95f653 100644 --- a/lib/chef/resource/windows_package.rb +++ b/lib/chef/resource/windows_package.rb @@ -43,7 +43,11 @@ class Chef # In the past we accepted return code 127 for an unknown reason and 42 because of a bug property :returns, [ String, Integer, Array ], default: [ 0 ], desired_state: false property :source, String, - coerce: proc { |s| uri_scheme?(s) ? s : Chef::Util::PathHelper.canonical_path(s, false) } + coerce: (proc do |s| + unless s.nil? + uri_scheme?(s) ? s : Chef::Util::PathHelper.canonical_path(s, false) + end + end) property :checksum, String, desired_state: false property :remote_file_attributes, Hash, desired_state: false end diff --git a/spec/functional/resource/windows_package_spec.rb b/spec/functional/resource/windows_package_spec.rb index 65378653b0..f5fdc9ef3d 100644 --- a/spec/functional/resource/windows_package_spec.rb +++ b/spec/functional/resource/windows_package_spec.rb @@ -29,7 +29,7 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do subject do new_resource = Chef::Resource::WindowsPackage.new(pkg_name, run_context) - new_resource.source pkg_path + new_resource.source pkg_path if pkg_path new_resource.version pkg_version new_resource.installer_type pkg_type new_resource.options pkg_options |