From 6e4eb328104d0d4342b65cdd00830622176922a9 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 3 Apr 2017 17:32:44 +0200 Subject: [PATCH] handle zlib correctly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Encryption was split from the “compression mode” and now depends entirely on the crypto context. Also only finalize a tar stream being “closed” if the underlying file is being closed. --- deltatar/tarfile.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py index 1788865..730f378 100644 --- a/deltatar/tarfile.py +++ b/deltatar/tarfile.py @@ -618,7 +618,7 @@ class _Stream: # if aes, we encrypt after compression if self.encryption is not None: - raise Exception ("XXX sorry, no can do") + pass elif set_last_block_offset: self.last_block_offset = self.fileobj.tell() @@ -712,9 +712,9 @@ class _Stream: if self.mode == "w": self._finalize_write_gz () self.__enc_write(self.buf) - fixed = self._finalize_write_encrypt () if close_fileobj is True: + fixed = self._finalize_write_encrypt () if not self._extfileobj: self.fileobj.close() else: -- 1.7.1