Skip to content

Commit

Permalink
Fix integration with SQLAlchemy-migrate-0.6.1.
Browse files Browse the repository at this point in the history
SQLAlchemy-migrate moved all exceptions to migrate.exceptions.
  • Loading branch information
PiotrSikora committed Feb 16, 2011
1 parent eae1014 commit 5c47a5d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions master/buildbot/db/model.py
Expand Up @@ -21,10 +21,14 @@
import migrate
import migrate.versioning.schema
import migrate.versioning.repository
import migrate.versioning.exceptions
from twisted.python import util, log
from buildbot.db import base

try:
from migrate import exceptions
except ImportError:
from migrate.versioning import exceptions

class Model(base.DBConnectorComponent):
"""
DBConnector component to handle the database model; an instance is available
Expand Down Expand Up @@ -345,7 +349,7 @@ def thd(engine):
# migrate.api doesn't let us hand in an engine
schema = migrate.versioning.schema.ControlledSchema(engine, self.repo_path)
db_version = schema.version
except migrate.versioning.exceptions.DatabaseNotControlledError:
except exceptions.DatabaseNotControlledError:
return False

return db_version == repo_version
Expand Down

0 comments on commit 5c47a5d

Please sign in to comment.