diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/provider/package/cab.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/msu.rb | 1 | ||||
| -rw-r--r-- | lib/chef/resource/msu_package.rb | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/chef/provider/package/cab.rb b/lib/chef/provider/package/cab.rb index 71c649173f..3ede6dbe10 100644 --- a/lib/chef/provider/package/cab.rb +++ b/lib/chef/provider/package/cab.rb @@ -93,7 +93,7 @@ class Chef split_package_identity(p["package_identity"]) end found_packages = existing_package_identities.select do |existing_package_ident| - existing_package_ident["name"] == package["name"] + existing_package_ident["version"] == package["version"].chomp && existing_package_ident["name"] == package["name"] end if found_packages.empty? nil diff --git a/lib/chef/provider/package/msu.rb b/lib/chef/provider/package/msu.rb index 2c67e36e06..a8a8da858a 100644 --- a/lib/chef/provider/package/msu.rb +++ b/lib/chef/provider/package/msu.rb @@ -110,6 +110,7 @@ class Chef @cab_files.each do |cab_file| declare_resource(:cab_package, new_resource.name) do source cab_file + timeout new_resource.timeout action :install end end diff --git a/lib/chef/resource/msu_package.rb b/lib/chef/resource/msu_package.rb index c801cdd971..d07d7893a3 100644 --- a/lib/chef/resource/msu_package.rb +++ b/lib/chef/resource/msu_package.rb @@ -44,6 +44,11 @@ class Chef property :checksum, String, desired_state: false, description: "SHA-256 digest used to verify the checksum of the downloaded MSU package." + + property :timeout, [String, Integer], + default: 3600, + description: "The amount of time (in seconds) to wait before timing out.", + desired_state: false end end end |