diff options
| author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2022-03-01 20:57:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 20:57:08 -0800 |
| commit | 8efc7212cb8bd3e3b7cc968053fd0dda999aeaea (patch) | |
| tree | 4e53637eb99c7541f8f3fdf7eb78b0c0dcc33ee9 /lib | |
| parent | 17ae919254f1d26340a4f6847d3849499bc9e9d9 (diff) | |
| parent | fa543345c9b53760653417ae220a60112a2dbab0 (diff) | |
| download | chef-8efc7212cb8bd3e3b7cc968053fd0dda999aeaea.tar.gz | |
Merge pull request #12657 from chef/lcg/yum-fixing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/provider/package/yum/python_helper.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/chef/provider/package/yum/python_helper.rb b/lib/chef/provider/package/yum/python_helper.rb index bdf22b4ebd..c37daa4dbf 100644 --- a/lib/chef/provider/package/yum/python_helper.rb +++ b/lib/chef/provider/package/yum/python_helper.rb @@ -178,7 +178,20 @@ class Chef # # @api private def combine_args(provides, version, arch) - provides = provides.dup + provides = provides.to_s.strip + version = if !version.nil? && !version.empty? + version.to_s.strip + end + arch = if !arch.nil? && !arch.empty? + arch.to_s.strip + end + if version =~ /^[><=]/ + if arch + return { "provides" => "#{provides}.#{arch} #{version}" } + else + return { "provides" => "#{provides} #{version}" } + end + end maybe_arch = provides.rpartition(".").last if is_arch?(maybe_arch) arch = maybe_arch |