@@ -1,6 +1,10 @@ +*SVN* + +* Don't send no-auth-cache if no auth credentials are given [Jonathan Younger] + *1.4.1* (February 24, 2007) -* Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [jonathan] +* Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [Jonathan Younger] * Deprecated upper-cased variables [Jamis Buck] CHANGELOG @@ -80,7 +80,8 @@ module Capistrano def authorization username = configuration[:svn_username] ? "--username #{configuration[:svn_username]}" : "" password = configuration[:svn_password] ? "--password #{configuration[:svn_password]}" : "" - "--no-auth-cache #{username} #{password}" + no_auth_cache = configuration[:svn_username] || configuration[:svn_password] ? "--no-auth-cache" : "" + "#{no_auth_cache} #{username} #{password}" end def svn_log(path) lib/capistrano/scm/subversion.rb @@ -134,4 +134,12 @@ MSG assert_nil @actor.channels.last.sent_data assert_match %r{/path/to/svn\b.*\bco\b.* --username turtledove}, @actor.command end + + def test_svn_no_auth_cache + @actor.story = [] + @config[:svn_username] = "turtledove" + assert_nothing_raised { @scm.checkout(@actor) } + assert_nil @actor.channels.last.sent_data + assert_match %r{/path/to/svn\b.*\bco\b.* --no-auth-cache --username turtledove}, @actor.command + end end test/scm/subversion_test.rb 614152fbc445d148cb21a73e7d9c9ac127c47b5a Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/54cee940d2834f406d960d30193b8e442f55126a 54cee940d2834f406d960d30193b8e442f55126a 2007-03-05T09:32:16-08:00 2007-03-05T09:32:16-08:00 Don't send no-auth-cache if no auth credentials are given git-svn-id: http://svn.rubyonrails.org/rails/branches/capistrano_1-x-stable@6339 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 8c758b3ecb0c37cf34a3b72fea5d079d258e1c06 Jamis Buck jamis@37signals.com