Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop

2 files changed, 4 insertions, 2 deletions

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 27b478a1c3..54a7b70b63 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -14,6 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+sys.dont_write_bytecode = True
+
 from synapse.storage import prepare_database, UpgradeDatabaseException
 
 from synapse.server import HomeServer
@@ -49,7 +52,6 @@ import synapse
 import logging
 import os
 import re
-import sys
 import sqlite3
 import syweb
 
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py

index 363c20f994..3a70a248dc 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -19,7 +19,7 @@ import os
 import subprocess
 import signal
 
-SYNAPSE = ["python", "-m", "synapse.app.homeserver"]
+SYNAPSE = ["python", "-B", "-m", "synapse.app.homeserver"]
 
 CONFIGFILE = "homeserver.yaml"
 PIDFILE = "homeserver.pid"