diff options
| author | Tim Smith <tsmith@chef.io> | 2021-01-11 10:10:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 10:10:27 -0800 |
| commit | 54d022e6191931ed0da1b095f05b8acfcf20ebc9 (patch) | |
| tree | 93e4fa7b89c843adca069d54ae2609ef582c4634 | |
| parent | ddbb348d5f041a4994ff689fbc218b955ca36d88 (diff) | |
| parent | e50d6e907d6bebec70271e9bcca50459dad88548 (diff) | |
| download | chef-54d022e6191931ed0da1b095f05b8acfcf20ebc9.tar.gz | |
Merge pull request #10813 from mrtazz/mrtazz/pkgng-exit-code-fix
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/provider/package/freebsd/pkgng.rb | 4 | ||||
| -rw-r--r-- | spec/unit/provider/package/freebsd/pkgng_spec.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/provider/package/freebsd/pkgng.rb b/lib/chef/provider/package/freebsd/pkgng.rb index 87acb3a830..077464b5c2 100644 --- a/lib/chef/provider/package/freebsd/pkgng.rb +++ b/lib/chef/provider/package/freebsd/pkgng.rb @@ -42,7 +42,9 @@ class Chef end def current_installed_version - pkg_info = shell_out!("pkg", "info", new_resource.package_name, env: nil, returns: [0, 70]) + # pkgng up to version 1.15.99.7 returns 70 for pkg not found, + # later versions return 1 + pkg_info = shell_out!("pkg", "info", new_resource.package_name, env: nil, returns: [0, 1, 70]) pkg_info.stdout[/^Version +: (.+)$/, 1] end diff --git a/spec/unit/provider/package/freebsd/pkgng_spec.rb b/spec/unit/provider/package/freebsd/pkgng_spec.rb index bc78a178eb..ce5d58b7dc 100644 --- a/spec/unit/provider/package/freebsd/pkgng_spec.rb +++ b/spec/unit/provider/package/freebsd/pkgng_spec.rb @@ -66,7 +66,7 @@ describe Chef::Provider::Package::Freebsd::Port do end it "should query pkg database" do - expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "zsh", env: nil, returns: [0, 70], timeout: 900).and_return(@pkg_info) + expect(@provider).to receive(:shell_out_compacted!).with("pkg", "info", "zsh", env: nil, returns: [0, 1, 70], timeout: 900).and_return(@pkg_info) expect(@provider.current_installed_version).to eq("3.1.7") end end |