Merge remote-tracking branch 'pib/unarchive_remote' into pull_5136

This commit is contained in:
Richard C Isaacson 2014-02-11 22:55:34 -06:00
commit a3be027909

View file

@ -37,6 +37,12 @@ options:
- Remote absolute path where the archive should be unpacked - Remote absolute path where the archive should be unpacked
required: true required: true
default: null default: null
copy:
description:
- Should the file be copied from the local to the remote machine?
required: false
choices: [ "yes", "no" ]
default: "yes"
author: Dylan Martin author: Dylan Martin
todo: todo:
- detect changed/unchanged for .zip files - detect changed/unchanged for .zip files
@ -153,6 +159,7 @@ def main():
src = dict(required=True), src = dict(required=True),
original_basename = dict(required=False), # used to handle 'dest is a directory' via template, a slight hack original_basename = dict(required=False), # used to handle 'dest is a directory' via template, a slight hack
dest = dict(required=True), dest = dict(required=True),
copy = dict(default=True, type='bool'),
), ),
add_file_common_args=True, add_file_common_args=True,
) )
@ -162,7 +169,10 @@ def main():
# did tar file arrive? # did tar file arrive?
if not os.path.exists(src): if not os.path.exists(src):
if copy:
module.fail_json(msg="Source '%s' failed to transfer" % (src)) module.fail_json(msg="Source '%s' failed to transfer" % (src))
else:
module.fail_json(msg="Source '%s' does not exist" % (src))
if not os.access(src, os.R_OK): if not os.access(src, os.R_OK):
module.fail_json(msg="Source '%s' not readable" % (src)) module.fail_json(msg="Source '%s' not readable" % (src))