Merge heinrich5991/buildbot:pr_versioncheck (PR #1259)

buildbot · Oct 14, 2014 · cc23bec · cc23bec
2 parents a343b1f + 7bd1d7b
commit cc23bec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/master/buildbot/db/model.py b/master/buildbot/db/model.py
@@ -720,7 +720,7 @@ def check_sqlalchemy_migrate_version():
                         version = "0.6"
                 except Exception:
                     version = "0.0"
-            version_tup = tuple(map(int, version.split('.')))
+            version_tup = tuple(map(int, version.split('-', 1)[0].split('.')))
             log.msg("using SQLAlchemy-Migrate version %s" % (version,))
             if version_tup < (0, 6, 1):
                 raise RuntimeError("You are using SQLAlchemy-Migrate %s. "

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -93,6 +93,8 @@ Fixes
 
 * Buildbot is now compatible with SQLAlchemy 0.8 and higher, using the newly-released SQLAlchemy-Migrate.
 
+* The version check for SQLAlchemy-Migrate was fixed to accept more version string formats.
+
 * The :bb:step:`HTTPStep` step's requeset parameters are now renderable.
 
 * With Git(), force the updating submodules to ensure local changes by the