valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21995 from jkur/develop

Browse Source 
Option handling for archive.tar fails with more uncommon options
This commit is contained in:
jfindlay 2015-03-26 13:09:16 -06:00
commit 5b55c48839
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/archive.py
View File

@ -101,8 +101,14 @@ def tar(options, tarfile, sources=None, dest=None,
if dest:
cmd.extend(['-C', '{0}'.format(dest)])
cmd.extend(['-{0}'.format(options), '{0}'.format(tarfile)])
cmd.extend(sources)
if not options.startswith('-'):
options = '-{0}'.format(options)
cmd.extend(options.split(" "))
cmd.extend(['{0}'.format(tarfile)])
if sources is not None:
cmd.extend(sources)
return __salt__['cmd.run'](cmd,
cwd=cwd,