diff options
| author | Chris Doherty <randomcamel@users.noreply.github.com> | 2014-10-08 08:55:35 -0700 |
|---|---|---|
| committer | Chris Doherty <randomcamel@users.noreply.github.com> | 2014-10-08 08:55:35 -0700 |
| commit | e54ad3b28b54f2f02b00c16a6ff29291b0c52b6f (patch) | |
| tree | 2a2f17b9dcb7ac0830167b58dd8c498fcfab29d5 | |
| parent | 19adfd52154a227717ecb2823750dae4bc34a57c (diff) | |
| parent | d24b477b4bfe542ea979524505c634cb449a607b (diff) | |
| download | chef-e54ad3b28b54f2f02b00c16a6ff29291b0c52b6f.tar.gz | |
Merge pull request #1980 from bahamas10/dave-1409788502
fix FreeBSD pkgng provider (version detection)
| -rw-r--r-- | lib/chef/provider/package/freebsd/pkgng.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/freebsd/pkgng_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/freebsd/pkgng.rb b/lib/chef/provider/package/freebsd/pkgng.rb index 0741a4d95f..bfe6dca617 100644 --- a/lib/chef/provider/package/freebsd/pkgng.rb +++ b/lib/chef/provider/package/freebsd/pkgng.rb @@ -45,7 +45,7 @@ class Chef def current_installed_version pkg_info = shell_out!("pkg info \"#{@new_resource.package_name}\"", :env => nil, :returns => [0,70]) - pkg_info.stdout[/^#{Regexp.escape(@new_resource.package_name)}-(.+)/, 1] + pkg_info.stdout[/^Version +: (.+)$/, 1] end def candidate_version diff --git a/spec/unit/provider/package/freebsd/pkgng_spec.rb b/spec/unit/provider/package/freebsd/pkgng_spec.rb index 001c9e23ba..c3837a251b 100644 --- a/spec/unit/provider/package/freebsd/pkgng_spec.rb +++ b/spec/unit/provider/package/freebsd/pkgng_spec.rb @@ -67,7 +67,7 @@ describe Chef::Provider::Package::Freebsd::Port do describe "determining current installed version" do before(:each) do @provider.stub(:supports_pkgng?) - @pkg_info = OpenStruct.new(:stdout => "zsh-3.1.7\n") + @pkg_info = OpenStruct.new(:stdout => "zsh-3.1.7\nVersion : 3.1.7\n") end it "should query pkg database" do |