diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-10-10 13:39:21 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-10-10 13:39:21 -0700 |
| commit | 07b7c3aafd0a29b121e5bcc9717b609acd8ae50f (patch) | |
| tree | 64c56a1b9f3ec1ae2570bbec9287f81748433fd2 | |
| parent | a83ceb39cb8e26a6ce9c89614cb30bb44239757a (diff) | |
| parent | 689cafea8df384e0e6350e33ce7781bb6b2eef52 (diff) | |
| download | chef-07b7c3aafd0a29b121e5bcc9717b609acd8ae50f.tar.gz | |
Merge pull request #1957 from BundesIT/master
honor package category for paludis packages
| -rw-r--r-- | lib/chef/provider/package/paludis.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/paludis_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb index 7c5245fc97..f363b38e50 100644 --- a/lib/chef/provider/package/paludis.rb +++ b/lib/chef/provider/package/paludis.rb @@ -34,7 +34,7 @@ class Chef installed = false re = Regexp.new('(.*)[[:blank:]](.*)[[:blank:]](.*)$') - shell_out!("cave -L warning print-ids -M none -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line| + shell_out!("cave -L warning print-ids -M none -m \"#{@new_resource.package_name}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line| res = re.match(line) unless res.nil? case res[3] diff --git a/spec/unit/provider/package/paludis_spec.rb b/spec/unit/provider/package/paludis_spec.rb index c99600e535..8387bb1252 100644 --- a/spec/unit/provider/package/paludis_spec.rb +++ b/spec/unit/provider/package/paludis_spec.rb @@ -59,7 +59,7 @@ PKG_STATUS end it "should run pkg info with the package name" do - @provider.should_receive(:shell_out!).with("cave -L warning print-ids -M none -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").and_return(@shell_out) + @provider.should_receive(:shell_out!).with("cave -L warning print-ids -M none -m \"#{@new_resource.package_name}\" -f \"%c/%p %v %r\n\"").and_return(@shell_out) @provider.load_current_resource end |