Skip to content

Commit 6917294

Browse files
author
Nathan Huang
committed
update warning word.
1 parent d8a5078 commit 6917294

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ $ sudo apt-get install mycli # Only on debian or ubuntu
6363
--ssh-password TEXT Password to connect to ssh server.
6464
--ssh-key-filename TEXT Private key filename (identify file) for the
6565
ssh connection.
66-
--ssh-config-path TEXT Path to ssh configuation
67-
--ssh-config-host TEXT Host for ssh server in ssh configuations
66+
--ssh-config-path TEXT Path to ssh configuation.
67+
--ssh-config-host TEXT Host for ssh server in ssh configuations (requires paramiko).
6868
--ssl-ca PATH CA file in PEM format.
6969
--ssl-capath TEXT CA directory.
7070
--ssl-cert PATH X509 cert in PEM format.
@@ -80,7 +80,7 @@ $ sudo apt-get install mycli # Only on debian or ubuntu
8080
section of myclirc file.
8181
--list-dsn list of DSN configured into the [alias_dsn]
8282
section of myclirc file.
83-
--list-ssh-config list of ssh configuration in the ssh config.
83+
--list-ssh-config list ssh configurations in the ssh config (requires paramiko).
8484
-R, --prompt TEXT Prompt format (Default: "\t \u@\h:\d> ").
8585
-l, --logfile FILENAME Log every query and its results to a file.
8686
--defaults-group-suffix TEXT Read MySQL config groups with the specified

mycli/main.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ def get_last_query(self):
10061006
@click.option('--list-dsn', 'list_dsn', is_flag=True,
10071007
help='list of DSN configured into the [alias_dsn] section of myclirc file.')
10081008
@click.option('--list-ssh-config', 'list_ssh_config', is_flag=True,
1009-
help='list of ssh configurations in the ssh config.')
1009+
help='list ssh configurations in the ssh config (requires paramiko).')
10101010
@click.option('-R', '--prompt', 'prompt',
10111011
help='Prompt format (Default: "{0}").'.format(
10121012
MyCli.default_prompt))
@@ -1079,8 +1079,7 @@ def cli(database, user, host, port, socket, password, dbname,
10791079
if list_ssh_config:
10801080
if not paramiko:
10811081
click.secho(
1082-
"Cannot use SSH transport because paramiko isn't installed, "
1083-
"please install paramiko or don't use --list-ssh-config=",
1082+
"This features requires paramiko. Please install paramiko and try again.",
10841083
err=True, fg='red'
10851084
)
10861085
exit(1)
@@ -1155,8 +1154,7 @@ def cli(database, user, host, port, socket, password, dbname,
11551154
if ssh_config_host:
11561155
if not paramiko:
11571156
click.secho(
1158-
"Cannot use SSH transport because paramiko isn't installed, "
1159-
"please install paramiko or don't use --ssh-config_host=",
1157+
"This features requires paramiko. Please install paramiko and try again.",
11601158
err=True, fg='red'
11611159
)
11621160
exit(1)

0 commit comments

Comments
 (0)