Permalink
Browse files

Fix convergence failure.

  • Loading branch information...
fnichol committed Nov 12, 2012
1 parent 200e388 commit d6cdb2ab93c421ca6234cbaf5548c914eba4084f
Showing with 3 additions and 2 deletions.
  1. +2 −2 libraries/chef_rvm_recipe_helpers.rb
  2. +1 −0 recipes/default.rb
@@ -75,7 +75,7 @@ def install_rvm(opts = {})
rvm_installed_check = rvm_wrap_cmd(
%{type rvm | cat | head -1 | grep -q '^rvm is a function$'}, user_dir
- ), :environment => exec_env
+ )
i = execute exec_name do
user opts[:user] || "root"
@@ -89,7 +89,7 @@ def install_rvm(opts = {})
action :run
end
- not_if rvm_installed_check
+ not_if rvm_installed_check, :environment => exec_env
end
i.run_action(:run) if install_now
end
View
@@ -35,6 +35,7 @@ class Chef::Resource
class Chef::Recipe
# mix in recipe helpers
+ include Chef::RVM::ShellHelpers
include Chef::RVM::RecipeHelpers
include Chef::RVM::StringHelpers
end

0 comments on commit d6cdb2a

Please sign in to comment.