summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-08-07 17:22:11 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-08-07 17:22:11 +0100
commit0db40d3e939506e22b927214bb0d3eaad40730ab (patch)
treee5d320bb216ac4f78cb7e4c58807176e1dd281dc
parentAdd a --generate-keys option (diff)
downloadsynapse-0db40d3e939506e22b927214bb0d3eaad40730ab.tar.xz
Don't complain about extra .pyc files we find while hunting for database schemas
-rw-r--r--synapse/storage/__init__.py5
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)