Repository: spark Updated Branches: refs/heads/branch-1.4 3f6e6e0e2 -> df763495f
[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.dan...@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 <saru...@oss.nttdata.co.jp> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df763495 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df763495 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df763495 Branch: refs/heads/branch-1.4 Commit: df763495f48e67995434019b943df97e7b39194d Parents: 3f6e6e0 Author: Daniel Darabos <darabos.dan...@gmail.com> Authored: Thu Jul 9 07:34:02 2015 +0900 Committer: Kousuke Saruta <saru...@oss.nttdata.co.jp> Committed: Thu Jul 9 07:34:51 2015 +0900 ---------------------------------------------------------------------- ec2/spark_ec2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/df763495/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 91f0a24..3880c2d 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
