diff options
| author | Paul Evans <leonerd@leonerd.org.uk> | 2015-08-07 17:49:54 +0100 |
|---|---|---|
| committer | Paul Evans <leonerd@leonerd.org.uk> | 2015-08-07 17:49:54 +0100 |
| commit | e69b6690833b6233a2d8529e98f6a55ebafbd03e (patch) | |
| tree | e5d320bb216ac4f78cb7e4c58807176e1dd281dc /synapse/storage | |
| parent | Merge pull request #209 from matrix-org/erikj/cached_keyword_args (diff) | |
| parent | Don't complain about extra .pyc files we find while hunting for database schemas (diff) | |
| download | synapse-e69b6690833b6233a2d8529e98f6a55ebafbd03e.tar.xz | |
Merge pull request #213 from matrix-org/paul/SYN-420
Three small improvements to help debian package (SYN-420)
Diffstat (limited to 'synapse/storage')
| -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 71d5d92500..973e78e047 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) |