cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8441 from willthames/unarchive_dest_fix

Browse source 
Unarchive should work when parent directory is not writable
This commit is contained in:
Michael DeHaan 2014-08-22 15:05:42 -04:00
commit ef10c2dd9b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
files/unarchive
View file

@ -115,8 +115,6 @@ class TgzFile(object):
self.zipflag = 'z' self.zipflag = 'z'
def is_unarchived(self): def is_unarchived(self):
dirof = os.path.dirname(self.dest)
destbase = os.path.basename(self.dest)
cmd = '%s -v -C "%s" --diff -%sf "%s"' % (self.cmd_path, self.dest, self.zipflag, self.src) cmd = '%s -v -C "%s" --diff -%sf "%s"' % (self.cmd_path, self.dest, self.zipflag, self.src)
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd)
unarchived = (rc == 0) unarchived = (rc == 0)
@ -220,10 +218,10 @@ def main():
) )
# is dest OK to receive tar file? # is dest OK to receive tar file?
if not os.path.exists(os.path.dirname(dest)): if not os.path.isdir(dest):
module.fail_json(msg="Destination directory '%s' does not exist" % (os.path.dirname(dest))) module.fail_json(msg="Destination '%s' is not a directory" % dest)
if not os.access(os.path.dirname(dest), os.W_OK): if not os.access(dest, os.W_OK):
module.fail_json(msg="Destination '%s' not writable" % (os.path.dirname(dest))) module.fail_json(msg="Destination '%s' not writable" % dest)
handler = pick_handler(src, dest, module) handler = pick_handler(src, dest, module)