Merge branch 'develop' of github.com:matrix-org/synapse into failures

This commit is contained in:
Erik Johnston 2015-02-17 17:43:14 +00:00
commit 649dc8a7e2
2 changed files with 3 additions and 2 deletions

View file

@ -74,7 +74,9 @@ SCHEMAS = [
# Remember to update this number every time an incompatible change is made to # Remember to update this number every time an incompatible change is made to
# database schema files, so the users will be informed on server restarts. # database schema files, so the users will be informed on server restarts.
SCHEMA_VERSION = 12 SCHEMA_VERSION = 13
dir_path = os.path.abspath(os.path.dirname(__file__))
class _RollbackButIsFineException(Exception): class _RollbackButIsFineException(Exception):
@ -583,7 +585,6 @@ def schema_path(schema):
A filesystem path pointing at a ".sql" file. A filesystem path pointing at a ".sql" file.
""" """
dir_path = os.path.dirname(__file__)
schemaPath = os.path.join(dir_path, "schema", schema + ".sql") schemaPath = os.path.join(dir_path, "schema", schema + ".sql")
return schemaPath return schemaPath