HA
/
patool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63 from yarikoptic/bf-man 

BF(Travis): fixes for Travis
This commit is contained in:
Yaroslav Halchenko 2018-09-11 15:26:38 -04:00 committed by GitHub
parent a79e2646ee a9f3ee3d63
commit 087cd9ee33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -11,12 +11,13 @@ branches:
# install some archive programs # install some archive programs
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq archmage arj bzip2 lbzip2 pbzip2 cabextract ncompress cpio bsdcpio lzop lcab p7zip p7zip-full zip unzip rpm2cpio binutils arc nomarch unalz lrzip bsdtar rzip zoo xdms orange lzip plzip clzip pdlzip sharutils flac unadf zoo zpaq libchm-bin genisoimage rpm - sudo apt-get install -qq archmage arj bzip2 lbzip2 pbzip2 cabextract ncompress cpio bsdcpio lzop lcab p7zip p7zip-full zip unzip rpm2cpio binutils arc nomarch unalz lrzip bsdtar rzip zoo xdms lzip plzip clzip pdlzip sharutils flac unadf zoo zpaq libchm-bin genisoimage rpm
# apt errors: # apt errors:
#E: Package 'p7zip-rar' has no installation candidate #E: Package 'p7zip-rar' has no installation candidate
#E: Package 'rar' has no installation candidate #E: Package 'rar' has no installation candidate
#E: Package 'unrar' has no installation candidate #E: Package 'unrar' has no installation candidate
#E: Package 'lha' has no installation candidate #E: Package 'lha' has no installation candidate
#E: Package 'orange' has no installation candidate
#E: Unable to locate package unace-nonfree #E: Unable to locate package unace-nonfree
#E: Unable to locate package zopfli #E: Unable to locate package zopfli

1
patoolib/__init__.py
View File

@ -46,6 +46,7 @@ ArchiveCompressions = ('bzip2', 'compress', 'gzip', 'lzip', 'lzma', 'xz')
# Map MIME types to archive format # Map MIME types to archive format
ArchiveMimetypes = { ArchiveMimetypes = {
'application/gzip': 'gzip', 'application/gzip': 'gzip',
'application/jar': 'zip', # reported on older systems such as ubuntu 14.04
'application/java-archive': 'zip', 'application/java-archive': 'zip',
'application/rar': 'rar', 'application/rar': 'rar',
'application/vnd.ms-cab-compressed': 'cab', 'application/vnd.ms-cab-compressed': 'cab',

2
tests/test_mime.py
View File

@ -134,7 +134,7 @@ class TestMime (unittest.TestCase):
self.mime_test_file("t.chm.foo", "application/x-chm") self.mime_test_file("t.chm.foo", "application/x-chm")
self.mime_test_file("t.iso", "application/x-iso9660-image") self.mime_test_file("t.iso", "application/x-iso9660-image")
self.mime_test_file("t.epub", "application/zip") self.mime_test_file("t.epub", "application/zip")
self.mime_test_file("t.apk", ("application/zip", "application/java-archive")) self.mime_test_file("t.apk", ("application/zip", "application/java-archive", "application/jar"))
self.mime_test_file("t.zpaq", "application/zpaq") self.mime_test_file("t.zpaq", "application/zpaq")
self.mime_test_file("t.zpaq.foo", "application/zpaq") self.mime_test_file("t.zpaq.foo", "application/zpaq")