p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

roslaunch: less confusing printout of user is none on ssh printlog statement

This commit is contained in:
Ken Conley 2010-07-02 00:01:48 +00:00
parent e39f0214a5
commit b3a79e476e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/roslaunch/src/roslaunch/remoteprocess.py
View File

@ -245,7 +245,10 @@ class SSHChildROSLaunchProcess(roslaunch.server.ChildROSLaunchProcess):
self.lock.acquire()
name = self.name
m = self.machine
printlog("remote[%s]: creating ssh connection to %s:%s, user[%s]"%(name, m.address, m.ssh_port, m.user))
if m.user is not None:
printlog("remote[%s]: creating ssh connection to %s:%s, user[%s]"%(name, m.address, m.ssh_port, m.user))
else:
printlog("remote[%s]: creating ssh connection to %s:%s"%(name, m.address, m.ssh_port))
_logger.info("remote[%s]: invoking with ssh exec args [%s], env: %s"%(name, ' '.join(self.args), self.env))
sshvals, msg = self._ssh_exec(' '.join(self.args), self.env, m.address, m.ssh_port, m.user, m.password)
if sshvals is None: