From a2af059e6cb3f4d0de045e65948515e80f336209 Mon Sep 17 00:00:00 2001 From: Federico Di Gregorio Date: Sun, 9 Aug 2009 16:28:27 +0200 Subject: [PATCH] Fixed PostgreSQL version detection --- ChangeLog | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 736b934e..c913042b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-08-08 Federico Di Gregorio + * setup.py: fixed version detection for PostgreSQL rc, as + suggested by Sok Ann Yap. + * ZPsycopgDA/db.py: applied serialization error retry from Brian Sutherland. diff --git a/setup.py b/setup.py index 5d71680d..8d1ea3d7 100644 --- a/setup.py +++ b/setup.py @@ -208,7 +208,7 @@ class psycopg_build_ext(build_ext): except: pgversion = "7.4.0" - verre = re.compile(r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|beta\d+))") + verre = re.compile(r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(beta|rc)\d+))") m = verre.match(pgversion) if m: pgmajor, pgminor, pgpatch = m.group(1, 2, 3)