saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Detect --strip/--strip-components in tar options and handle properly

Browse source
This commit is contained in:
Erik Johnson 2016-12-14 21:56:41 -06:00
parent e95770594d
commit c502e68f12
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/states/archive.py
View file

@ -527,7 +527,7 @@ def extracted(name,
- name: /opt/
- source: https://github.com/downloads/Graylog2/graylog2-server/graylog2-server-0.9.6p1.tar.gz
- source_hash: md5=499ae16dcae71eeb7c3a30c75ea7a1a6
- tar_options: v
- options: v
- user: foo
- group: foo
@ -684,6 +684,21 @@ def extracted(name,
ret.setdefault('warnings', []).append(msg)
options = zip_options
if options is not None and not isinstance(options, six.string_types):
options = str(options)
strip_components = None
if options and archive_format == 'tar':
try:
strip_components = int(
re.search(
r'''--strip(?:-components)?(?:\s+|=)["']?(\d+)["']?''',
options
).group(1)
)
except (AttributeError, ValueError):
pass
if archive_format == 'zip':
if options:
if use_cmd_unzip is None:
@ -859,6 +874,7 @@ def extracted(name,
contents = __salt__['archive.list'](cached_source,
archive_format=archive_format,
options=list_options,
strip_components=strip_components,
clean=False,
verbose=True)
except CommandExecutionError as exc:
@ -1160,10 +1176,7 @@ def extracted(name,
)
return ret
try:
tar_opts = shlex.split(options)
except AttributeError:
tar_opts = shlex.split(str(options))
tar_opts = shlex.split(options)
tar_cmd = ['tar']
tar_shortopts = 'x'