summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdministrator <Administrator>2017-10-05 12:18:25 +0530
committerAdministrator <Administrator>2017-10-05 12:18:25 +0530
commitf04a1c83c84bf5108e4346eff20c472de2f51334 (patch)
tree64e72ce50f2a9c6bba0ed3189e8173f472ed5b5b
parent70d529c81182754bf4df1730c5f342aff1345118 (diff)
downloadchef-f04a1c83c84bf5108e4346eff20c472de2f51334.tar.gz
update code to fix appveyor issues
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
-rw-r--r--lib/chef/provider/package/chocolatey.rb13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb
index acb5ad468a..e782ecd94c 100644
--- a/lib/chef/provider/package/chocolatey.rb
+++ b/lib/chef/provider/package/chocolatey.rb
@@ -233,16 +233,9 @@ EOS
begin
cmd = [ "list -r #{pkg}" ]
cmd.push( "-source #{new_resource.source}" ) if new_resource.source
- raw = parse_list_output(*cmd).first.each_slice(2).to_h
- raw1 = parse_list_output(*cmd)
- if raw1.length > 1
- raw1.keys.each_with_object({}) do |name, available|
- available[name] = desired_name_versions[name] || raw1[name]
- end
- else
- raw.keys.each_with_object({}) do |name, available|
- available[name] = desired_name_versions[name] || raw[name]
- end
+ raw = parse_list_output(*cmd)
+ raw.keys.each_with_object({}) do |name, available|
+ available[name] = desired_name_versions[name] || raw[name]
end
end
@available_packages.merge! available_versions