fix exception if remote upload fails on newer ssh client

facchinm · facchinm · commit 8f524e14a598 · 2016-04-01T12:05:57.000+02:00
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -135,7 +135,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       return runUploadTool(ssh, prefs);
     } catch (JSchException e) {
       String message = e.getMessage();
-      if ("Auth cancel".equals(message) || "Auth fail".equals(message)) {
+      if (message.contains("Auth cancel") || message.contains("Auth fail") || message.contains("authentication fail")) {
         return false;
       }
       if (e.getMessage().contains("Connection refused")) {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String`
`135`	`135`	`return runUploadTool(ssh, prefs);`
`136`	`136`	`} catch (JSchException e) {`
`137`	`137`	`String message = e.getMessage();`
`138`		`- if ("Auth cancel".equals(message) \|\| "Auth fail".equals(message)) {`
	`138`	`+ if (message.contains("Auth cancel") \|\| message.contains("Auth fail") \|\| message.contains("authentication fail")) {`
`139`	`139`	`return false;`
`140`	`140`	`}`
`141`	`141`	`if (e.getMessage().contains("Connection refused")) {`