diff options
author | Tim Smith <tsmith@chef.io> | 2019-08-07 14:57:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-07 14:57:47 -0700 |
commit | e1bbb76da532e944538ae8d78facddf2380d15a1 (patch) | |
tree | a34027b158cbc100d257160c0a9c896f0596bc57 | |
parent | 4b670e26e28766d16a10e95ddd71114abd567163 (diff) | |
parent | 33674f9ce1f1a72cf06540d105bdba56cd2cd429 (diff) | |
download | chef-e1bbb76da532e944538ae8d78facddf2380d15a1.tar.gz |
Merge pull request #8794 from chef/Kapil/MSYS-1065_rhsm_repo_disable_does_not_support_wildcard
Fix for rhsm_repo disable does not support wildcard
-rw-r--r-- | lib/chef/resource/rhsm_repo.rb | 2 | ||||
-rw-r--r-- | spec/unit/resource/rhsm_repo_spec.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/chef/resource/rhsm_repo.rb b/lib/chef/resource/rhsm_repo.rb index feb2aa0802..c593bd900f 100644 --- a/lib/chef/resource/rhsm_repo.rb +++ b/lib/chef/resource/rhsm_repo.rb @@ -57,7 +57,7 @@ class Chef def repo_enabled?(repo) cmd = Mixlib::ShellOut.new("subscription-manager repos --list-enabled", env: { LANG: "en_US" }) cmd.run_command - !cmd.stdout.match(/Repo ID:\s+#{repo}$/).nil? + repo == "*" || !cmd.stdout.match(/Repo ID:\s+#{repo}$/).nil? end end end diff --git a/spec/unit/resource/rhsm_repo_spec.rb b/spec/unit/resource/rhsm_repo_spec.rb index 36eb235798..dda2882c75 100644 --- a/spec/unit/resource/rhsm_repo_spec.rb +++ b/spec/unit/resource/rhsm_repo_spec.rb @@ -60,5 +60,11 @@ describe Chef::Resource::RhsmRepo do expect(provider.repo_enabled?("differentrepo")).to eq(false) end end + + context "when user pass wildcard" do + it "returns true" do + expect(provider.repo_enabled?("*")).to eq(true) + end + end end end |