diff options
| author | Thom May <thom@may.lt> | 2016-08-23 18:05:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 18:05:59 +0100 |
| commit | 2b3c878d7e1b4acf01e09613b341940bdbabecdc (patch) | |
| tree | 31b7647bcf246557bdba2572b3d417b58b29b629 | |
| parent | dca6734d9c22953f80f3fd8b13e16f8a141f2a36 (diff) | |
| parent | 2b35272f744c1649b03561d627feec7135f00ad9 (diff) | |
| download | chef-2b3c878d7e1b4acf01e09613b341940bdbabecdc.tar.gz | |
Merge pull request #5128 from criteo-forks/package_cookbook_name
Forward package cookbook_name to underlying remote_file
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index a5f3ff7191..753d3c279e 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -201,6 +201,7 @@ class Chef def resource_for_provider @resource_for_provider = Chef::Resource::WindowsPackage.new(new_resource.name).tap do |r| r.source(Chef::Util::PathHelper.validate_path(source_location)) unless source_location.nil? + r.cookbook_name = new_resource.cookbook_name r.version(new_resource.version) r.timeout(new_resource.timeout) r.returns(new_resource.returns) @@ -216,6 +217,7 @@ class Chef def source_resource @source_resource ||= Chef::Resource::RemoteFile.new(default_download_cache_path, run_context).tap do |r| r.source(new_resource.source) + r.cookbook_name = new_resource.cookbook_name r.checksum(new_resource.checksum) r.backup(false) |