From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Sep 2010 15:22:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b637b9219808c49d717ed9156debb8fbb55b5e3e;hp=7ae8ff5952dc012ae2adeac5699ebc0f48b9b9ff;p=dak.git

Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  Seems to work with 0.6 too
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index f8c53760..5a92dc81 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -72,11 +72,11 @@ class DebVersion(sqltypes.Text):
         return "DEBVERSION"
 
 sa_major_version = sqlalchemy.__version__[0:3]
-if sa_major_version == "0.5":
+if sa_major_version in ["0.5", "0.6"]:
     from sqlalchemy.databases import postgres
     postgres.ischema_names['debversion'] = DebVersion
 else:
-    raise Exception("dak isn't ported to SQLA versions != 0.5 yet.  See daklib/dbconn.py")
+    raise Exception("dak only ported to SQLA versions 0.5 and 0.6.  See daklib/dbconn.py")
 
 ################################################################################