From 484c091c622511d190a155a96bd2b1a8836a8642 Mon Sep 17 00:00:00 2001 From: Martin Hostettler Date: Mon, 22 Aug 2016 19:48:39 +0200 Subject: [PATCH] =?UTF-8?q?RepositoryServer:=20Don=E2=80=98t=20try=20to=20?= =?UTF-8?q?close=20the=20repository=20if=20it=20was=20not=20yet=20opened.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- borg/remote.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/borg/remote.py b/borg/remote.py index 472d1ac36..5c42b58a1 100644 --- a/borg/remote.py +++ b/borg/remote.py @@ -79,12 +79,14 @@ class RepositoryServer: # pragma: no cover if r: data = os.read(stdin_fd, BUFSIZE) if not data: - self.repository.close() + if self.repository is not None: + self.repository.close() return unpacker.feed(data) for unpacked in unpacker: if not (isinstance(unpacked, tuple) and len(unpacked) == 4): - self.repository.close() + if self.repository is not None: + self.repository.close() raise Exception("Unexpected RPC data format.") type, msgid, method, args = unpacked method = method.decode('ascii')