From 68c309273a0966b62bd6a83bed5e632396255c3f Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Thu, 9 Aug 2018 17:20:20 +0200 Subject: [PATCH 1/2] handle possible failure of git describe (#24646) --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 41756b1..1039d16 100755 --- a/setup.py +++ b/setup.py @@ -17,11 +17,12 @@ def get_version(): version_file.close() return version if os.path.exists('.git'): - p = subprocess.Popen(['git','describe','--match=v*'], stdout=subprocess.PIPE) + p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE) result = p.communicate()[0] - version = result.split()[0][1:] - version = version.replace('-', '.') - return version + if p.returncode == 0: + version = str(result.split()[0][1:]) + version = version.replace('-', '.') + return version return '0' class eo_sdist(sdist): -- 2.18.0