Permalink
Browse files

Use the --password switch for subversion by default, but add :scm_pre…

…fer_prompt

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7694 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 094b20e commit d5ecc1caabb9033b033d971157ed37e70756f126 @jamis jamis committed Sep 30, 2007
Showing with 7 additions and 1 deletion.
  1. +5 −0 CHANGELOG
  2. +2 −1 lib/capistrano/recipes/deploy/scm/subversion.rb
View
@@ -1,3 +1,8 @@
+*SVN*
+
+* Use the --password switch for subversion by default, but add :scm_prefer_prompt variable (defaults to false) [Jamis Buck]
+
+
*2.0.100 (2.1 Preview 1)* September 1, 2007
* capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
@@ -81,14 +81,15 @@ def handle_data(state, stream, text)
private
- # If a username is configured for the SCM, return the =command-line
+ # If a username is configured for the SCM, return the command-line
# switches for that. Note that we don't need to return the password
# switch, since Capistrano will check for that prompt in the output
# and will respond appropriately.
def authentication
username = variable(:scm_username)
return "" unless username
result = "--username #{variable(:scm_username)} "
+ result << "--password #{variable(:scm_password)} " unless variable(:scm_prefer_prompt)
result << "--no-auth-cache " unless variable(:scm_auth_cache)
result
end

0 comments on commit d5ecc1c

Please sign in to comment.