From 22724f0500b6e74ef9899b0b9aae7946e9db9b99 Mon Sep 17 00:00:00 2001
From: Ruslan Kuprieiev <ruslan@iterative.ai>
Date: Tue, 11 Dec 2018 14:11:21 +0200
Subject: [PATCH] ssh: mention private key passphrase in the prompt

Fixes #1425
---
 dvc/prompt.py     | 2 +-
 dvc/remote/ssh.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dvc/prompt.py b/dvc/prompt.py
index 1144d4316..827aeff2d 100644
--- a/dvc/prompt.py
+++ b/dvc/prompt.py
@@ -32,7 +32,7 @@ class Prompt(object):
         if not sys.stdout.isatty():
             return None
 
-        msg = 'Enter password for {}:\n'.format(msg)
+        msg = '{}:\n'.format(msg)
 
         if not progress.is_finished:
             msg = u'\n' + msg
diff --git a/dvc/remote/ssh.py b/dvc/remote/ssh.py
index 7f5b6aa9b..46652388e 100644
--- a/dvc/remote/ssh.py
+++ b/dvc/remote/ssh.py
@@ -91,7 +91,8 @@ class RemoteSSH(RemoteBase):
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
         if self.ask_password and self.password is None:
-            msg = "host '{}' port '{}' user '{}'".format(host, port, user)
+            msg = ("Enter a private key passphrase or a password for "
+                   "host '{}' port '{}' user '{}'").format(host, port, user)
             self.password = self.project.prompt.prompt_password(msg)
 
         ssh.connect(host,