+ def run_noexcept2(self, cmd, timeout=COMMAND_TIMEOUT*2):
+ cmd = "ssh -p %s %s %s@%s %s" % (self.port, self.__options_to_str(),
+ self.user, self.host, cmd)
+ #print "SSH.run_noexcept2(%s)" % cmd
+ r = CMD.run_noexcept(self, cmd, timeout)
+
+ # XXX: this may be resulting in deadlocks... not sure.
+ #if self.s.returncode is None:
+ # #self.s.kill()
+ # self.s.kill(signal.SIGKILL)
+ # self.s.wait()
+ # self.ret = self.s.returncode
+ self.ret = -1
+
+ return r
+
+ def system2(self, cmd, timeout=COMMAND_TIMEOUT*2):
+ cmd = "ssh -p %s %s %s@%s %s" % (self.port, self.__options_to_str(),
+ self.user, self.host, cmd)
+ #print "SSH.system2(%s)" % cmd
+ return CMD.system(self, cmd, timeout)
+