]> git.donarmstrong.com Git - dak.git/commitdiff
Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak
authorJoerg Jaspert <joerg@debian.org>
Sun, 19 Sep 2010 15:22:22 +0000 (17:22 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 19 Sep 2010 15:22:22 +0000 (17:22 +0200)
* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  Seems to work with 0.6 too

daklib/dbconn.py

index f8c537603aba6b9e259e50988ab2d3ccf52cc373..5a92dc8146c39e365b85f012b22a0a81717e1153 100755 (executable)
@@ -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")
 
 ################################################################################