From b11d60b23463d80d7b3e870f7c167b6868ab8579 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sat, 22 Dec 2018 23:43:01 +0000
Subject: [PATCH] Avoid packaging _trial_temp directory

Make sure we don't put the _trial_temp directory in the package target
directory.

Fixes https://github.com/matrix-org/synapse/issues/4322
---
 changelog.d/4326.bugfix | 2 ++
 debian/build_virtualenv | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/4326.bugfix

diff --git a/changelog.d/4326.bugfix b/changelog.d/4326.bugfix
new file mode 100644
index 000000000000..acce6266b8bc
--- /dev/null
+++ b/changelog.d/4326.bugfix
@@ -0,0 +1,2 @@
+Avoid packaging _trial_temp directory in -py3 debian packages
+
diff --git a/debian/build_virtualenv b/debian/build_virtualenv
index 61ffb131921f..3241f46ae2d4 100755
--- a/debian/build_virtualenv
+++ b/debian/build_virtualenv
@@ -41,8 +41,7 @@ tmpdir=`mktemp -d`
 trap "rm -r $tmpdir" EXIT
 
 cp -r tests "$tmpdir"
-cd debian/matrix-synapse-py3
 
 PYTHONPATH="$tmpdir" \
-    ./opt/venvs/matrix-synapse/bin/python \
+    debian/matrix-synapse-py3/opt/venvs/matrix-synapse/bin/python \
         -B -m twisted.trial --reporter=text -j2 tests