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

Fix program config for 7z.

This commit is contained in:
Bastian Kleineidam 2012-05-24 23:10:05 +02:00
parent df3863e177
commit 1b2f0f8a09
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patoolib/__init__.py
View File

@ -99,11 +99,10 @@ ArchivePrograms = {
'list': ('nomarch',), 'list': ('nomarch',),
}, },
'bzip2': { 'bzip2': {
None: ('7z', '7za'), 'extract': ('pbzip2', 'lbzip2', 'bzip2', '7z', '7za', 'py_bz2'),
'extract': ('pbzip2', 'lbzip2', 'bzip2', 'py_bz2'), 'test': ('pbzip2', 'lbzip2', 'bzip2', '7z', '7za'),
'test': ('pbzip2', 'lbzip2', 'bzip2'),
'create': ('pbzip2', 'lbzip2', 'bzip2', 'py_bz2'), 'create': ('pbzip2', 'lbzip2', 'bzip2', 'py_bz2'),
'list': ('py_echo',), 'list': ('py_echo', '7z', '7za'),
}, },
'flac': { 'flac': {
'extract': ('flac',), 'extract': ('flac',),
@ -441,7 +440,9 @@ def check_archive_arguments (archive, command, *args):
def _handle_archive (archive, command, *args, **kwargs): def _handle_archive (archive, command, *args, **kwargs):
"""Handle archive command; raising PatoolError on errors.""" """Handle archive command; raising PatoolError on errors.
@return: output directory if command is 'extract', else None
"""
check_archive_arguments(archive, command, *args) check_archive_arguments(archive, command, *args)
format, compression = kwargs.get("format"), kwargs.get("compression") format, compression = kwargs.get("format"), kwargs.get("compression")
if format is None: if format is None:
@ -474,7 +475,7 @@ def _handle_archive (archive, command, *args, **kwargs):
cmdlist = get_archive_cmdlist(archive, compression, program, *args, **cmd_kwargs) cmdlist = get_archive_cmdlist(archive, compression, program, *args, **cmd_kwargs)
if cmdlist: if cmdlist:
# an empty command list means the get_archive_cmdlist() function # an empty command list means the get_archive_cmdlist() function
# already handled the command (eg. when it's a builting Python # already handled the command (eg. when it's a builtin Python
# function) # function)
run_archive_cmdlist(cmdlist) run_archive_cmdlist(cmdlist)
if command == 'extract': if command == 'extract':