diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-20 23:36:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 23:36:30 -0600 |
| commit | e8690dec2e4928e08188c69eb866dd17d0e1409c (patch) | |
| tree | 3547ba46cd82bac16d2514ebd36c3a5599b63726 | |
| parent | Remove riot.im from the list of trusted Identity Servers in the default confi... (diff) | |
| parent | Ignore __pycache__ directories in schema delta dir (diff) | |
| download | synapse-e8690dec2e4928e08188c69eb866dd17d0e1409c.tar.xz | |
Merge pull request #4214 from matrix-org/rav/ignore_pycache
Ignore __pycache__ directories in schema delta dir
| -rw-r--r-- | changelog.d/4214.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/prepare_database.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4214.misc b/changelog.d/4214.misc new file mode 100644 index 0000000000..b2f62060e3 --- /dev/null +++ b/changelog.d/4214.misc @@ -0,0 +1 @@ +Ignore __pycache__ directories in the database schema folder diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index bd740e1e45..d5d2f89a77 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -257,7 +257,7 @@ def _upgrade_existing_database(cur, current_version, applied_delta_files, module.run_create(cur, database_engine) if not is_empty: module.run_upgrade(cur, database_engine, config=config) - elif ext == ".pyc": + elif ext == ".pyc" or file_name == "__pycache__": # Sometimes .pyc files turn up anyway even though we've # disabled their generation; e.g. from distribution package # installers. Silently skip it |