[Buildbot-commits] [buildbot/buildbot] 7bd1d7: Fix SQLAlchemy-Migrate version check

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 7bd1d7bc8f2cda5a6334c76f48534d25c87ec18c
      https://github.com/buildbot/buildbot/commit/7bd1d7bc8f2cda5a6334c76f48534d25c87ec18c
  Author: heinrich5991 <heinrich5991 at gmail.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M master/buildbot/db/model.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Fix SQLAlchemy-Migrate version check

It failed for strings like `'0.9.1-r0'`.

```
$ buildbot create-master foobar
[...]
  File "/usr/lib/python2.7/site-packages/buildbot/db/model.py", line 547, in upgrade
    check_sqlalchemy_migrate_version()
  File "/usr/lib/python2.7/site-packages/buildbot/db/model.py", line 502, in check_sqlalchemy_migrate_version
    version_tup = tuple(map(int, version.split('.')))
exceptions.ValueError: invalid literal for int() with base 10: '1-r0'

$ python2 -c "import migrate; print(migrate.__version__)"
0.9.1-r0
```


  Commit: cc23bec98741c6fe8877332e499f7463478ca321
      https://github.com/buildbot/buildbot/commit/cc23bec98741c6fe8877332e499f7463478ca321
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M master/buildbot/db/model.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge heinrich5991/buildbot:pr_versioncheck (PR #1259)


Compare: https://github.com/buildbot/buildbot/compare/a343b1fc5919...cc23bec98741