summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Berger <th.berger@it.piratenpartei.de>2014-07-23 16:44:41 +0200
committerThomas Berger <th.berger@it.piratenpartei.de>2014-07-23 16:44:41 +0200
commitbcde7ac3441ad6788f98d6e8e18c48ca77707276 (patch)
tree8749efa948f819375074e542624f85f551672321
parentdd742991862f6b1c9b8d193549f6b87c5c92cfa6 (diff)
downloadchef-bcde7ac3441ad6788f98d6e8e18c48ca77707276.tar.gz
some paludis fixes
- only search for non-masked packages - increased the command timeout for the installation process to a reasonable large number
-rw-r--r--lib/chef/provider/package/paludis.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb
index e304cd3b8e..7d40fdff03 100644
--- a/lib/chef/provider/package/paludis.rb
+++ b/lib/chef/provider/package/paludis.rb
@@ -37,7 +37,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]
@@ -62,7 +62,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 => 86400)
end
def upgrade_package(name, version)