tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #4214 from matrix-org/rav/ignore_pycache

Browse source 
Ignore __pycache__ directories in schema delta dir
This commit is contained in:
Amber Brown 2018-11-20 23:36:30 -06:00 committed by GitHub
commit e8690dec2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4214.misc Normal file
View file

@ -0,0 +1 @@
Ignore __pycache__ directories in the database schema folder

2
synapse/storage/prepare_database.py
View file

@ -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