Skip to content

Commit

Permalink
Changed rvm_trust_rvmrcs to rvm_trust_rvmrcs_flag=1, as it is a flag.…
Browse files Browse the repository at this point in the history
… Take Note Folks!
  • Loading branch information
wayneeseguin committed Nov 16, 2010
1 parent c24b646 commit aade040
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 2 additions & 0 deletions examples/rvmrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@
# Make Flags, I have 8 cpu's so I might use 7 make threads:
#export rvm_make_flags="-j7"

# Automatically trust project .rvmrc files
# export rvm_trust_rvmrcs_flag=1
2 changes: 1 addition & 1 deletion lib/rvm/environment/tools.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def tools_path_identifier(path)
path_identifier = rvm(:tools, "path-identifier", path.to_s)
if path_identifier.exit_status == 2
error_message = "The rvmrc located in '#{path}' could not be loaded, likely due to trust mechanisms."
error_message << " Please run 'rvm rvmrc {trust,untrust} \"#{path}\"' to continue, or set rvm_trust_rvmrcs to 1."
error_message << " Please run 'rvm rvmrc {trust,untrust} \"#{path}\"' to continue, or set rvm_trust_rvmrcs_flag to 1."
raise ErrorLoadingRVMRC, error_message
end
return normalize(path_identifier.stdout)
Expand Down
2 changes: 2 additions & 0 deletions scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ upgrade_notes()
Upgrade Notes
* rvm_trust_rvmrcs has been changed to rvm_trust_rvmrcs_flag for consistency
* Ruby package dependency list for your OS is given by:
rvm notes
Expand Down
4 changes: 2 additions & 2 deletions scripts/utility
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ __rvm_rvmrc_tools()
fi
;;
load)
rvm_rvmrc_cwd="" rvm_trust_rvmrcs=1 \
rvm_rvmrc_cwd="" rvm_trust_rvmrcs_flag=1 \
__rvm_project_rvmrc "$(dirname "$rvmrc_path")"
;;
*)
Expand All @@ -1237,7 +1237,7 @@ __rvm_rvmrc_tools()
__rvm_check_rvmrc_trustworthiness()
{
# Trust when they have the flag... of doom!
[[ -z "$1" || "$rvm_trust_rvmrcs" = "1" ]] && return 0
[[ -z "$1" || "$rvm_trust_rvmrcs_flag" = "1" ]] && return 0
value="$(__rvm_rvmrc_stored_trust "$1")"
if [[ -z "$value" ]] ; then
__rvm_ask_to_trust "$1"
Expand Down

0 comments on commit aade040

Please sign in to comment.