diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-07 19:28:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-07 19:28:39 +0100 |
| commit | 7dec0b2beeca1d1b7d298dc814fcfc5aff52340c (patch) | |
| tree | 1579a8cec0170025627645ced547704cf2410605 /synapse/storage/__init__.py | |
| parent | Batch up various DB requests for event -> state (diff) | |
| parent | Merge pull request #212 from matrix-org/erikj/cache_deferreds (diff) | |
| download | synapse-7dec0b2beeca1d1b7d298dc814fcfc5aff52340c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 1a6a8a3762..c6ce65b4cc 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -354,6 +354,11 @@ def _upgrade_existing_database(cur, current_version, applied_delta_files, ) logger.debug("Running script %s", relative_path) module.run_upgrade(cur, database_engine) + elif ext == ".pyc": + # Sometimes .pyc files turn up anyway even though we've + # disabled their generation; e.g. from distribution package + # installers. Silently skip it + pass elif ext == ".sql": # A plain old .sql file, just read and execute it logger.debug("Applying schema %s", relative_path) |