Changeset 8754

Timestamp:

01/30/08 05:56:23 (7 months ago)

Author:

minam

Message:

If subversion asks for a password, prompt as a last resort (closes #9885)

Files:

• tools/capistrano/CHANGELOG (modified) (1 diff)
• tools/capistrano/lib/capistrano/recipes/deploy/scm/subversion.rb (modified) (2 diffs)

tools/capistrano/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* If subversion asks for a password, prompt as a last resort [Jamis Buck]
-
-* Use checkout --lightweight for bzr checkout, instead of branch [michiels]

tools/capistrano/lib/capistrano/recipes/deploy/scm/subversion.rb

@@ -73 +73 @@
-          when /\bpassword.*:/i
-            # subversion is prompting for a password
-variable(:scm_password) || variable(:password)
+scm_password_prompt
-          when %r{\(yes/no\)}
-            # subversion is asking whether or not to connect
@@ -108 +108 @@
-            variable(:scm_verbose) ? nil : "-q"
-          end
+
+          def scm_password_prompt
+            @scm_password_prompt ||= variable(:scm_password) ||
+              variable(:password) ||
+              Capistrano::CLI.password_prompt("Subversion password: ")
+          end
-      end
-