Changeset 2053 in ProjectBuilder

Timestamp:

Feb 21, 2016, 2:44:01 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Improve error handling for bad ssh key detection

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -4528 +4528 @@
     $keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa" if ((-s "$ENV{'HOME'}/.ssh/pb_ecdsa") && ($ecdsa != 0));
 }
-die "Unable to find your public ssh key under $ENV{'HOME'}/.ssh" if (not defined $keyfile);
-pb_log(2,"Using ssh key file $keyfile\n");
+if (defined $keyfile) {
+    pb_log(2,"Using ssh key file $keyfile\n");
+} else {
+    pb_log(0, "Unable to find your public ssh key under $ENV{'HOME'}/.ssh\n");
+}
 return($keyfile);
 }
@@ -4947 +4950 @@
 # Prepare the key to be used and transfered remotely
 $keyfile = pb_ssh_get(1,$vmhost->{$ENV{'PBPROJ'}},$nport);
+return if (not defined $keyfile);
 
 # We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1