Skip to content

Commit

Permalink
only update alternatives for jre, ignore failures anyway, because the…
Browse files Browse the repository at this point in the history
… command is inconsistent when it works
  • Loading branch information
jtimberman committed Dec 9, 2009
1 parent 0d8dc99 commit 33442e8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion java/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs java"
version "0.7"
version "0.8"

%w{ debian ubuntu }.each do |os|
supports os
Expand Down
3 changes: 1 addition & 2 deletions java/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
)

execute "update-java-alternatives" do
command "update-java-alternatives -s java-6-sun"
command "update-java-alternatives -s java-6-sun --jre"
only_if do platform?("ubuntu", "debian") end
ignore_failure true
returns 1
action :nothing
end

Expand Down

0 comments on commit 33442e8

Please sign in to comment.