diff options
| author | Daniel Schauenberg <d@unwiredcouch.com> | 2021-01-01 22:58:01 +0100 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-03-25 10:59:08 -0700 |
| commit | fc54fef56dde6d756429eeff04f14eaec805c780 (patch) | |
| tree | 418b76348d68d6d5a6522f8c170024f3c73076bf | |
| parent | ebbc62b44d518f17fbfb75583d9522200db61e0d (diff) | |
| download | chef-fc54fef56dde6d756429eeff04f14eaec805c780.tar.gz | |
adapt to FreeBSD pkgng sysexit changes
Signed-off-by: Daniel Schauenberg <d@unwiredcouch.com>
| -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 48fc7a0dd5..f7f1c39c15 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 |