Commit bb5f2575 by Michael DeHaan Committed by James Cammarata

Proper check for raw as module options versus raw being in the string.

parent e338c743
...@@ -151,7 +151,7 @@ class ActionModule(object): ...@@ -151,7 +151,7 @@ class ActionModule(object):
return ReturnData(conn=conn, result=dict(dest=dest, changed=True)) return ReturnData(conn=conn, result=dict(dest=dest, changed=True))
# run the copy module # run the copy module
if 'raw' in module_args: if raw:
# don't send down raw=no # don't send down raw=no
module_args.pop('raw') module_args.pop('raw')
module_args = "%s src=%s original_basename=%s" % (module_args, pipes.quote(tmp_src), pipes.quote(os.path.basename(source))) module_args = "%s src=%s original_basename=%s" % (module_args, pipes.quote(tmp_src), pipes.quote(os.path.basename(source)))
...@@ -168,7 +168,7 @@ class ActionModule(object): ...@@ -168,7 +168,7 @@ class ActionModule(object):
return ReturnData(conn=conn, result=dict(dest=dest, changed=False)) return ReturnData(conn=conn, result=dict(dest=dest, changed=False))
tmp_src = tmp + os.path.basename(source) tmp_src = tmp + os.path.basename(source)
if 'raw' in module_args: if raw:
# don't send down raw=no # don't send down raw=no
module_args.pop('raw') module_args.pop('raw')
module_args = "%s src=%s" % (module_args, pipes.quote(tmp_src)) module_args = "%s src=%s" % (module_args, pipes.quote(tmp_src))
......
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