diff options
| author | Tim Smith <tsmith@chef.io> | 2019-07-01 10:34:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 10:34:13 -0700 |
| commit | df3031c1c88b6cdd5d9d1d5dfe461916962071ab (patch) | |
| tree | 7337ae3a9f3f0c24503b88b81af3d27058096836 /lib | |
| parent | 54eb052418d071f30aa9d97fd3bc907ef0cf6e90 (diff) | |
| parent | 80188e70f6c330bf6257206c67a27c9b84a86e98 (diff) | |
| download | chef-df3031c1c88b6cdd5d9d1d5dfe461916962071ab.tar.gz | |
Merge pull request #8687 from criteo-forks/issue_7215_yum_package_custom_repo
Pass yum_package options to underlying python helper
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/provider/package/yum.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index 55f478745c..74343fa10d 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -93,10 +93,8 @@ class Chef next if n.nil? av = available_version(i) - name = av.name # resolve the name via the available/candidate version - - iv = python_helper.package_query(:whatinstalled, av.name_with_arch) + iv = python_helper.package_query(:whatinstalled, av.name_with_arch, options: options) method = "install" @@ -237,9 +235,9 @@ class Chef def installed_version(index) @installed_version ||= [] @installed_version[index] ||= if new_resource.source - python_helper.package_query(:whatinstalled, available_version(index).name, arch: safe_arch_array[index]) + python_helper.package_query(:whatinstalled, available_version(index).name, arch: safe_arch_array[index], options: options) else - python_helper.package_query(:whatinstalled, package_name_array[index], arch: safe_arch_array[index]) + python_helper.package_query(:whatinstalled, package_name_array[index], arch: safe_arch_array[index], options: options) end @installed_version[index] end |