mirror of
https://github.com/capistrano/capistrano
synced 2023-03-27 23:21:18 -04:00
Use the --password switch for subversion by default, but add :scm_prefer_prompt
git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7694 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
094b20eb5e
commit
d5ecc1caab
2 changed files with 7 additions and 1 deletions
|
@ -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
|
*2.0.100 (2.1 Preview 1)* September 1, 2007
|
||||||
|
|
||||||
* capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
|
* capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
|
||||||
|
|
|
@ -81,7 +81,7 @@ module Capistrano
|
||||||
|
|
||||||
private
|
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
|
# switches for that. Note that we don't need to return the password
|
||||||
# switch, since Capistrano will check for that prompt in the output
|
# switch, since Capistrano will check for that prompt in the output
|
||||||
# and will respond appropriately.
|
# and will respond appropriately.
|
||||||
|
@ -89,6 +89,7 @@ module Capistrano
|
||||||
username = variable(:scm_username)
|
username = variable(:scm_username)
|
||||||
return "" unless username
|
return "" unless username
|
||||||
result = "--username #{variable(:scm_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 << "--no-auth-cache " unless variable(:scm_auth_cache)
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue