Commit 85a31616 by Michael DeHaan

Call os.path.expanduser in the creates= and removes= section of the command…

Call os.path.expanduser in the creates= and removes= section of the command module so ~/ and the like works.
parent b3548703
...@@ -145,6 +145,7 @@ class CommandModule(AnsibleModule): ...@@ -145,6 +145,7 @@ class CommandModule(AnsibleModule):
# do not run the command if the line contains creates=filename # do not run the command if the line contains creates=filename
# and the filename already exists. This allows idempotence # and the filename already exists. This allows idempotence
# of command executions. # of command executions.
v = os.path.expanduser(v)
if os.path.exists(v): if os.path.exists(v):
self.exit_json( self.exit_json(
cmd=args, cmd=args,
...@@ -158,10 +159,11 @@ class CommandModule(AnsibleModule): ...@@ -158,10 +159,11 @@ class CommandModule(AnsibleModule):
# do not run the command if the line contains removes=filename # do not run the command if the line contains removes=filename
# and the filename do not exists. This allows idempotence # and the filename do not exists. This allows idempotence
# of command executions. # of command executions.
v = os.path.expanduser(v)
if not os.path.exists(v): if not os.path.exists(v):
self.exit_json( self.exit_json(
cmd=args, cmd=args,
stdout="skipped, since %s do not exists" % v, stdout="skipped, since %s does not exist" % v,
skipped=True, skipped=True,
changed=False, changed=False,
stderr=False, stderr=False,
......
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