Commit 20b0dc4a by James Cammarata

Check for an empty executable passed into the accelerate plugin

This was breaking at least the script module, so it would seem best
to check for it and set it to the default executable value
parent 4bf506f6
...@@ -138,6 +138,9 @@ class Connection(object): ...@@ -138,6 +138,9 @@ class Connection(object):
def exec_command(self, cmd, tmp_path, sudo_user, sudoable=False, executable='/bin/sh'): def exec_command(self, cmd, tmp_path, sudo_user, sudoable=False, executable='/bin/sh'):
''' run a command on the remote host ''' ''' run a command on the remote host '''
if executable == "":
executable = constants.DEFAULT_EXECUTABLE
if self.runner.sudo or sudoable and sudo_user: if self.runner.sudo or sudoable and sudo_user:
cmd, prompt = utils.make_sudo_cmd(sudo_user, executable, cmd) cmd, prompt = utils.make_sudo_cmd(sudo_user, executable, cmd)
......
...@@ -217,7 +217,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler): ...@@ -217,7 +217,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
if 'executable' not in data: if 'executable' not in data:
return dict(failed=True, msg='internal error: executable is required') return dict(failed=True, msg='internal error: executable is required')
log("executing: %s" % data['cmd']) #log("executing: %s" % data['cmd'])
rc, stdout, stderr = self.server.module.run_command(data['cmd'], executable=data['executable'], close_fds=True) rc, stdout, stderr = self.server.module.run_command(data['cmd'], executable=data['executable'], close_fds=True)
if stdout is None: if stdout is None:
stdout = '' stdout = ''
...@@ -306,7 +306,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler): ...@@ -306,7 +306,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
log("failed to put the file: %s" % tb) log("failed to put the file: %s" % tb)
return dict(failed=True, stdout="Could not write the file") return dict(failed=True, stdout="Could not write the file")
finally: finally:
log("wrote %d bytes" % bytes) #log("wrote %d bytes" % bytes)
out_fd.close() out_fd.close()
if final_path: if final_path:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment