summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-02-05 12:08:12 +0100
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2017-02-05 12:08:12 +0100
commit8be30e2d89916096c61ea1df872c2fe61b6464b4 (patch)
treef8021946ef1f79cb5572fdff055ee0964d9e8709 /setup.py
parent7b780f084ddb075d29c54631125ecb5ef365cc12 (diff)
parentc6af16c3ae86a8607bc2fd72a307599456cbe55b (diff)
downloadpsycopg2-travis-deadlock.tar.gz
Merge branch 'master' into travis-deadlocktravis-deadlock
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index d251f98..0f34ceb 100644
--- a/setup.py
+++ b/setup.py
@@ -417,10 +417,12 @@ class psycopg_build_ext(build_ext):
pgversion = "7.4.0"
verre = re.compile(
- r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))")
+ r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?")
m = verre.match(pgversion)
if m:
pgmajor, pgminor, pgpatch = m.group(1, 2, 3)
+ if pgminor is None or not pgminor.isdigit():
+ pgminor = 0
if pgpatch is None or not pgpatch.isdigit():
pgpatch = 0
pgmajor = int(pgmajor)