diff options
author | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2017-09-27 15:26:05 +0530 |
---|---|---|
committer | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2017-09-29 19:09:12 +0530 |
commit | aafba0eddf29352c9bc3c1b3e338544a380800c2 (patch) | |
tree | 16614c6673af38bc3ad61fb1383c14a11c6db68b | |
parent | d2186523180426ae2daaa961a84a52999ff02593 (diff) | |
download | chef-aafba0eddf29352c9bc3c1b3e338544a380800c2.tar.gz |
Fix review comments
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
-rw-r--r-- | lib/chef/provider/package/chocolatey.rb | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index 4e40136ca1..acb5ad468a 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -177,11 +177,7 @@ EOS # @return [Array] list of candidate_version, same index as new_resource.package_name/version def build_candidate_versions new_resource.package_name.map do |package_name| - if new_resource.source && new_resource.source.include?("artifactory") - available_packages_from_artifactory[package_name.downcase] - else - available_packages[package_name.downcase] - end + available_packages[package_name.downcase] end end @@ -230,27 +226,13 @@ EOS # # @return [Hash] name-to-version mapping of available packages def available_packages - @available_packages ||= - begin - cmd = [ "list -r #{package_name_array.join ' '}" ] - cmd.push( "-source #{new_resource.source}" ) if new_resource.source - 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 - end - - # Getting packages from Artifactory server and return as candidate - def available_packages_from_artifactory - return @available_packages_from_artifactory if @available_packages_from_artifactory - @available_packages_from_artifactory = {} - package_name_array.length.times do |item| + return @available_packages if @available_packages + @available_packages = {} + package_name_array.each do |pkg| available_versions = begin - cmd = [ "list -r #{package_name_array[item]}" ] - cmd.push( "-source #{new_resource.source}" ) + 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 @@ -263,9 +245,9 @@ EOS end end end - @available_packages_from_artifactory.merge! available_versions + @available_packages.merge! available_versions end - @available_packages_from_artifactory + @available_packages end # Installed packages in chocolatey as a Hash of names mapped to versions |