diff options
author | Matt Martz <matt@sivel.net> | 2015-06-11 12:36:47 -0500 |
---|---|---|
committer | Greg DeKoenigsberg <greg@eucalyptus.com> | 2015-06-16 11:33:16 -0400 |
commit | ae75c26f870b92880d801c0968578e18f7eeddbc (patch) | |
tree | e0b5a5917392bdc14e59604a7816cddad17cf4bf | |
parent | 51cf9a029a3967ba2bc84fb9aa25b2cb3c71c423 (diff) | |
download | ansible-modules-extras-ae75c26f870b92880d801c0968578e18f7eeddbc.tar.gz |
Remove the executable option as it's redundant
-rw-r--r-- | commands/expect.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/commands/expect.py b/commands/expect.py index 0922ba4e..124c718b 100644 --- a/commands/expect.py +++ b/commands/expect.py @@ -54,11 +54,6 @@ options: description: - cd into this directory before running the command required: false - executable: - description: - - change the shell used to execute the command. Should be an absolute - path to the executable. - required: false responses: description: - Mapping of expected string and string to respond with @@ -94,7 +89,6 @@ def main(): argument_spec=dict( command=dict(required=True), chdir=dict(), - executable=dict(), creates=dict(), removes=dict(), responses=dict(type='dict', required=True), @@ -107,7 +101,6 @@ def main(): module.fail_json(msg='The pexpect python module is required') chdir = module.params['chdir'] - executable = module.params['executable'] args = module.params['command'] creates = module.params['creates'] removes = module.params['removes'] @@ -156,13 +149,8 @@ def main(): startd = datetime.datetime.now() - if executable: - cmd = '%s %s' % (executable, args) - else: - cmd = args - try: - out, rc = pexpect.runu(cmd, timeout=timeout, withexitstatus=True, + out, rc = pexpect.runu(args, timeout=timeout, withexitstatus=True, events=events, cwd=chdir, echo=echo) except pexpect.ExceptionPexpect, e: module.fail_json(msg='%s' % e) |