From 5687f76552369fa20b3a4385eab4810214653aa7 Mon Sep 17 00:00:00 2001 From: Daniel Darabos Date: Thu, 9 Jul 2015 07:34:02 +0900 Subject: [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 Closes #7288 from darabos/patch-2 and squashes the following commits: be0d3b7 [Daniel Darabos] Correctly print hostname in error --- ec2/spark_ec2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ec2') diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8582d434a8..dd0c12d259 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -1153,8 +1153,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 -- cgit v1.2.3