Allow ~ expansion in chdir argument of command module

This allows the use of ~ in the chdir argument of the command module
I know the later change is absolutely necessary as the first change
was not sufficient. It may be that the first change fixes shell and
the second fixes command.
reviewable/pr18780/r1
willthames 12 years ago
parent 42ed10820b
commit 65a0f60c30

@ -39,7 +39,7 @@ def main():
module.fail_json(msg="no command given") module.fail_json(msg="no command given")
if chdir: if chdir:
os.chdir(chdir) os.chdir(os.path.expanduser(chdir))
if not shell: if not shell:
args = shlex.split(args) args = shlex.split(args)
@ -116,6 +116,7 @@ class CommandModule(AnsibleModule):
args = args.replace(x,'') args = args.replace(x,'')
elif x.startswith("chdir="): elif x.startswith("chdir="):
(k,v) = x.split("=", 1) (k,v) = x.split("=", 1)
v = os.path.expanduser(v)
if not (os.path.exists(v) and os.path.isdir(v)): if not (os.path.exists(v) and os.path.isdir(v)):
self.fail_json(msg="cannot change to directory '%s': path does not exist" % v) self.fail_json(msg="cannot change to directory '%s': path does not exist" % v)
elif v[0] != '/': elif v[0] != '/':

Loading…
Cancel
Save