Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

correctly merge options to unarchive command #20217

Merged
merged 2 commits into from
Jan 17, 2017
Merged

correctly merge options to unarchive command #20217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc4a45
fix https://github.com/ansible/ansible/issues/20183
sirkubax Jan 12, 2017
8d27e33
make it nicer
sirkubax Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ansible/modules/files/unarchive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,9 +555,10 @@ def is_unarchived(self):
return dict(unarchived=unarchived, rc=rc, out=out, err=err, cmd=cmd, diff=diff)

def unarchive(self):
cmd = [ self.cmd_path, '-o', self.src ]
cmd = [ self.cmd_path, '-o' ]
if self.opts:
cmd.extend(self.opts)
cmd.append(self.src)
# 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
Expand Down