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

Don't add included files as arguments on the command line (#4626)

Browse source 
This means we will have to unarchive the complete archive if a single change is found.
Unfortunately we cannot fix this for `unzip`, the only hope is a pure-python reimplementation.

This fixes problems reported in the comments of #3810
This commit is contained in:
Dag Wieers 2016-09-12 07:47:45 +02:00 committed by Matt Clay
parent 3366a95765
commit 433dfd0c5b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/files/unarchive.py
View file

@ -440,6 +440,7 @@ class ZipArchive(object):
elif stat.S_ISREG(st.st_mode) and timestamp < st.st_mtime: elif stat.S_ISREG(st.st_mode) and timestamp < st.st_mtime:
# Add to excluded files, ignore other changes # Add to excluded files, ignore other changes
out += 'File %s is newer, excluding file\n' % path out += 'File %s is newer, excluding file\n' % path
self.excludes.append(path)
continue continue
else: else:
if timestamp != st.st_mtime: if timestamp != st.st_mtime:
@ -545,12 +546,12 @@ class ZipArchive(object):
cmd = [ self.cmd_path, '-o', self.src ] cmd = [ self.cmd_path, '-o', self.src ]
if self.opts: if self.opts:
cmd.extend(self.opts) cmd.extend(self.opts)
if self.includes: # NOTE: Including (changed) files as arguments is problematic (limits on command line/arguments)
# if self.includes:
# NOTE: Command unzip has this strange behaviour where it expects quoted filenames to also be escaped # NOTE: Command unzip has this strange behaviour where it expects quoted filenames to also be escaped
cmd.extend(map(shell_escape, self.includes)) # cmd.extend(map(shell_escape, self.includes))
# We don't need to handle excluded files, since we simply do not include them if self.excludes:
# if self.excludes: cmd.extend([ '-x' ] + self.excludes)
# cmd.extend([ '-x' ] + self.excludes ])
cmd.extend([ '-d', self.dest ]) cmd.extend([ '-d', self.dest ])
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd)
return dict(cmd=cmd, rc=rc, out=out, err=err) return dict(cmd=cmd, rc=rc, out=out, err=err)