summary refs log tree commit diff
path: root/debian/build_virtualenv
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-23 11:43:04 +0000
committerGitHub <noreply@github.com>2019-01-23 11:43:04 +0000
commit2f88881c933d957885fec6ac565b553e4c7d9a3d (patch)
tree8e1002bc88ced47c91be3dbeb55e1773d15019df /debian/build_virtualenv
parentFixup removal of duplicate `user_ips` rows (#4432) (diff)
downloadsynapse-2f88881c933d957885fec6ac565b553e4c7d9a3d.tar.xz
debian package: symlink to python-3.X (#4433)
In the debian package, make the virtualenv symlink python to /usr/bin/python3.X
rather than /usr/bin/python3. Also make sure we depend on the right python3.x
package.

This might help a bit with subtle failures when people install a package from
the wrong distro (https://github.com/matrix-org/synapse/issues/4431).

Diffstat (limited to 'debian/build_virtualenv')
-rwxr-xr-xdebian/build_virtualenv15
1 files changed, 14 insertions, 1 deletions
diff --git a/debian/build_virtualenv b/debian/build_virtualenv

index 83346c40f1..8b51b9e074 100755 --- a/debian/build_virtualenv +++ b/debian/build_virtualenv
@@ -6,7 +6,16 @@ set -e export DH_VIRTUALENV_INSTALL_ROOT=/opt/venvs -SNAKE=/usr/bin/python3 + +# make sure that the virtualenv links to the specific version of python, by +# dereferencing the python3 symlink. +# +# Otherwise, if somebody tries to install (say) the stretch package on buster, +# they will get a confusing error about "No module named 'synapse'", because +# python won't look in the right directory. At least this way, the error will +# be a *bit* more obvious. +# +SNAKE=`readlink -e /usr/bin/python3` # try to set the CFLAGS so any compiled C extensions are compiled with the most # generic as possible x64 instructions, so that compiling it on a new Intel chip @@ -46,3 +55,7 @@ cp -r tests "$tmpdir" PYTHONPATH="$tmpdir" \ debian/matrix-synapse-py3/opt/venvs/matrix-synapse/bin/python \ -B -m twisted.trial --reporter=text -j2 tests + +# add a dependency on the right version of python to substvars. +PYPKG=`basename $SNAKE` +echo "synapse:pydepends=$PYPKG" >> debian/matrix-synapse-py3.substvars