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

Allow verbose option in diff and repack commands.

This commit is contained in:
Bastian Kleineidam 2012-04-09 12:26:54 +02:00
parent aa04cd9086
commit b9e60da545
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patoolib/__init__.py
View File

@ -468,7 +468,7 @@ def rmtree_log_error (func, path, exc):
util.log_error(msg) util.log_error(msg)
def _diff_archives (archive1, archive2): def _diff_archives (archive1, archive2, **kwargs):
"""Show differences between two archives.""" """Show differences between two archives."""
diff = util.find_program("diff") diff = util.find_program("diff")
if not diff: if not diff:
@ -476,23 +476,23 @@ def _diff_archives (archive1, archive2):
tmpdir1 = util.tmpdir() tmpdir1 = util.tmpdir()
tmpdir2 = util.tmpdir() tmpdir2 = util.tmpdir()
try: try:
path1 = _handle_archive(archive1, 'extract', outdir=tmpdir1) path1 = _handle_archive(archive1, 'extract', outdir=tmpdir1, **kwargs)
path2 = _handle_archive(archive2, 'extract', outdir=tmpdir2) path2 = _handle_archive(archive2, 'extract', outdir=tmpdir2, **kwargs)
return util.run([diff, "-urN", path1, path2]) return util.run([diff, "-urN", path1, path2])
finally: finally:
shutil.rmtree(tmpdir1, onerror=rmtree_log_error) shutil.rmtree(tmpdir1, onerror=rmtree_log_error)
shutil.rmtree(tmpdir2, onerror=rmtree_log_error) shutil.rmtree(tmpdir2, onerror=rmtree_log_error)
def _repack_archive (archive1, archive2): def _repack_archive (archive1, archive2, **kwargs):
"""Repackage an archive to a different format.""" """Repackage an archive to a different format."""
tmpdir = util.tmpdir() tmpdir = util.tmpdir()
try: try:
_handle_archive(archive1, 'extract', outdir=tmpdir) _handle_archive(archive1, 'extract', outdir=tmpdir, **kwargs)
archive = os.path.abspath(archive2) archive = os.path.abspath(archive2)
files = tuple(os.listdir(tmpdir)) files = tuple(os.listdir(tmpdir))
os.chdir(tmpdir) os.chdir(tmpdir)
_handle_archive(archive, 'create', *files) _handle_archive(archive, 'create', *files, **kwargs)
return 0 return 0
finally: finally:
shutil.rmtree(tmpdir, onerror=rmtree_log_error) shutil.rmtree(tmpdir, onerror=rmtree_log_error)