diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:46:09 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:46:09 -0700 |
| commit | e25bb63c172c623815664934ff1851df8f14e242 (patch) | |
| tree | 744ea6aa00daf22d953db7dc9916ee2887a9f3e5 /lib/chef/provider/package/paludis.rb | |
| parent | 73fd1e6405d95337bf29f4091b7caca3df793131 (diff) | |
| parent | 295daf387cbcb1b97202cad0effa98ccc8dc96a5 (diff) | |
| download | chef-e25bb63c172c623815664934ff1851df8f14e242.tar.gz | |
Merge pull request #1680 from BundesIT/master
Some minor fixes for the Paludis package provider
Diffstat (limited to 'lib/chef/provider/package/paludis.rb')
| -rw-r--r-- | lib/chef/provider/package/paludis.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb index f40962d74d..7c5245fc97 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 \"*/#{@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.split('/').last}\" -f \"%c/%p %v %r\n\"").stdout.each_line do |line| res = re.match(line) unless res.nil? case res[3] @@ -59,7 +59,7 @@ class Chef else pkg = "#{@new_resource.package_name}" end - shell_out!("cave -L warning resolve -x#{expand_options(@new_resource.options)} \"#{pkg}\"") + shell_out!("cave -L warning resolve -x#{expand_options(@new_resource.options)} \"#{pkg}\"",:timeout => @new_resource.timeout) end def upgrade_package(name, version) |