From 54a3b12b42edc9d428ef5be32b94ae2a142a0f45 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 19 Apr 2008 17:47:16 +0100 Subject: [PATCH] Cope with trailing text at the end of tar's version string. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Needed for Mac version. Reported by Anders F Björklund. --- zeroinstall/zerostore/unpack.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/zeroinstall/zerostore/unpack.py b/zeroinstall/zerostore/unpack.py index 37ea883..a44cdc3 100644 --- a/zeroinstall/zerostore/unpack.py +++ b/zeroinstall/zerostore/unpack.py @@ -43,13 +43,11 @@ def recent_gnu_tar(): """@deprecated: should be private""" recent_gnu_tar = False if _gnu_tar(): - version = _get_tar_version() - try: - version = version.split(')', 1)[1].strip() - assert version - version = map(int, version.split('.')) + version = re.search(r'\)\s*(\d+(\.\d+)*)', _get_tar_version()) + if version: + version = map(int, version.group(1).split('.')) recent_gnu_tar = version > [1, 13, 92] - except: + else: warn("Failed to extract GNU tar version number") debug("Recent GNU tar = %s", recent_gnu_tar) return recent_gnu_tar -- 2.11.4.GIT