diff options
| author | Daniel Darabos <darabos.daniel@gmail.com> | 2015-07-09 07:34:02 +0900 |
|---|---|---|
| committer | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2015-07-09 07:34:51 +0900 |
| commit | df763495f48e67995434019b943df97e7b39194d (patch) | |
| tree | e449c857e195644c5e3b64368f074656645cb322 | |
| parent | 3f6e6e0e2668832af1a54f5cb95e5a4537c7bc5a (diff) | |
| download | spark-df763495f48e67995434019b943df97e7b39194d.tar.gz spark-df763495f48e67995434019b943df97e7b39194d.tar.bz2 spark-df763495f48e67995434019b943df97e7b39194d.zip | |
[SPARK-8902] Correctly print hostname in error
With "+" the strings are separate expressions, and format() is called on the last string before concatenation. (So substitution does not happen.) Without "+" the string literals are merged first by the parser, so format() is called on the complete string.
Should I make a JIRA for this?
Author: Daniel Darabos <darabos.daniel@gmail.com>
Closes #7288 from darabos/patch-2 and squashes the following commits:
be0d3b7 [Daniel Darabos] Correctly print hostname in error
(cherry picked from commit 5687f76552369fa20b3a4385eab4810214653aa7)
Signed-off-by: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
| -rwxr-xr-x | ec2/spark_ec2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 91f0a24d12..3880c2d596 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -1111,8 +1111,8 @@ def ssh(host, opts, command): # If this was an ssh failure, provide the user with hints. if e.returncode == 255: raise UsageError( - "Failed to SSH to remote host {0}.\n" + - "Please check that you have provided the correct --identity-file and " + + "Failed to SSH to remote host {0}.\n" + "Please check that you have provided the correct --identity-file and " "--key-pair parameters and try again.".format(host)) else: raise e |