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

pull/4380/head
Michael DeHaan 11 years ago
parent d01d9b3a6d
commit 4987c73bb6

@ -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):
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))

Loading…
Cancel
Save