Skip to content

Commit

Permalink
Merge pull request #44287 from jf/fix_tbz.ext_archive_type_recognition
Browse files Browse the repository at this point in the history
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
  • Loading branch information
Erik Johnson committed Oct 27, 2017
2 parents 17d8e46 + 5e2cab0 commit 50dfc74
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion salt/utils/files.py
Expand Up @@ -59,7 +59,9 @@ def guess_archive_type(name):
Guess an archive type (tar, zip, or rar) by its file extension
'''
name = name.lower()
for ending in ('tar', 'tar.gz', 'tar.bz2', 'tar.xz', 'tgz', 'tbz2', 'txz',
for ending in ('tar', 'tar.gz', 'tgz',
'tar.bz2', 'tbz2', 'tbz',
'tar.xz', 'txz',
'tar.lzma', 'tlz'):
if name.endswith('.' + ending):
return 'tar'
Expand Down

0 comments on commit 50dfc74

Please sign in to comment.