Allowed empty ssh password for remote launching (#1826)

ros · Feb 7, 2020 · 2365bc7 · 2365bc7
1 parent 0830a4f
commit 2365bc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/roslaunch/src/roslaunch/core.py b/tools/roslaunch/src/roslaunch/core.py
@@ -347,7 +347,7 @@ def __init__(self, name, address,
         self.name = name
         self.env_loader = env_loader
         self.user = user or None
-        self.password = password or None
+        self.password = password
         self.address = address
         self.ssh_port = ssh_port
         self.assignable = assignable

diff --git a/tools/roslaunch/src/roslaunch/remoteprocess.py b/tools/roslaunch/src/roslaunch/remoteprocess.py
@@ -186,7 +186,7 @@ def _ssh_exec(self, command, address, port, username=None, password=None):
         if not err_msg:
             username_str = '%s@'%username if username else ''
             try:
-                if not password: #use SSH agent
+                if password is None: #use SSH agent
                     ssh.connect(address, port, username, timeout=TIMEOUT_SSH_CONNECT, key_filename=identity_file)
                 else: #use SSH with login/pass
                     ssh.connect(address, port, username, password, timeout=TIMEOUT_SSH_CONNECT)