From 04263795dfc82187bf5ef36f88648c9b8f7be25e Mon Sep 17 00:00:00 2001
From: Philipp Gesang <philipp.gesang@intra2net.com>
Date: Wed, 29 Jan 2020 10:28:34 +0100
Subject: [PATCH] account for one-tuple return

For some reason, feeding ``(0,)'' into os.read() as the length
argument fails with newer versions of python. Fix this by
unpacking the single element ``tuple'' before using it.
---
 deltatar/tarfile.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py
index fa771aa..21db045 100644
--- a/deltatar/tarfile.py
+++ b/deltatar/tarfile.py
@@ -3589,7 +3589,7 @@ def inspect_gz_hdr (fd, off):
     if flags & GZ_FLAG_FTEXT: # created by some contrarian
         verdict = HDR_CAND_FISHY
     if flags & GZ_FLAG_FEXTRA:
-        xlen = struct.unpack ("<H", os.read (fd, 2))
+        xlen = struct.unpack ("<H", os.read (fd, 2))[0]
         xtra = os.read (fd, xlen)
         if len (xtra) != xlen: # eof inside header
             return HDR_CAND_JUNK, None
-- 
1.7.1