summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--setup.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 736b934..c913042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2009-08-08 Federico Di Gregorio <fog@initd.org>
+ * 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 5d71680..8d1ea3d 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)