Mercurial > public > mercurial-scm > hg-stable
diff mercurial/archival.py @ 45084:3a6ec080b521
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 13 Jul 2020 13:06:12 -0400 |
| parents | a56ba57c837d 2c0043977b6d |
| children | 89a2afe31e82 |
line wrap: on
line diff
--- a/mercurial/archival.py Fri Jul 10 10:12:56 2020 +0200 +++ b/mercurial/archival.py Mon Jul 13 13:06:12 2020 -0400 @@ -189,7 +189,12 @@ name, pycompat.sysstr(mode), gzfileobj ) else: - return tarfile.open(name, pycompat.sysstr(mode + kind), fileobj) + try: + return tarfile.open( + name, pycompat.sysstr(mode + kind), fileobj + ) + except tarfile.CompressionError as e: + raise error.Abort(pycompat.bytestr(e)) if isinstance(dest, bytes): self.z = taropen(b'w:', name=dest)