From: Ali Alnubani <alialnu@mellanox.com>
Date: Wed, 6 Jun 2018 13:11:54 +0000 (+0200)
Subject: parsemail.sh: don't set the python version
X-Git-Tag: v2.0.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e338a3e4252f7dd28fdb95460d765e9931e41f70;p=thirdparty%2Fpatchwork.git

parsemail.sh: don't set the python version

This is to fix using the wrong python version when inside a virtualenv.

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
Signed-off-by: Stephen Finucane <stephen@that.guru>
(cherry picked from commit 951a58e4a6f71b91beb345a6608dc4d9fb231337)
---

diff --git a/patchwork/bin/parsemail-batch.sh b/patchwork/bin/parsemail-batch.sh
index 3d3725c6..8928d0a3 100755
--- a/patchwork/bin/parsemail-batch.sh
+++ b/patchwork/bin/parsemail-batch.sh
@@ -23,7 +23,7 @@ BIN_DIR=$(dirname "$0")
 PATCHWORK_BASE=$(readlink -e "$BIN_DIR/../..")
 
 if [ -z "$PW_PYTHON" ]; then
-    PW_PYTHON=python2
+    PW_PYTHON=python
 fi
 
 if [ -z "$DJANGO_SETTINGS_MODULE" ]; then
diff --git a/patchwork/bin/parsemail.sh b/patchwork/bin/parsemail.sh
index a742f60e..c9c9b6a1 100755
--- a/patchwork/bin/parsemail.sh
+++ b/patchwork/bin/parsemail.sh
@@ -23,7 +23,7 @@ BIN_DIR=$(dirname "$0")
 PATCHWORK_BASE=$(readlink -e "$BIN_DIR/../..")
 
 if [ -z "$PW_PYTHON" ]; then
-    PW_PYTHON=python2
+    PW_PYTHON=python
 fi
 
 if [ -z "$DJANGO_SETTINGS_MODULE" ]; then
diff --git a/releasenotes/notes/use-system-python-parsemail-9b161cebfd7d6159.yaml b/releasenotes/notes/use-system-python-parsemail-9b161cebfd7d6159.yaml
new file mode 100644
index 00000000..f0026566
--- /dev/null
+++ b/releasenotes/notes/use-system-python-parsemail-9b161cebfd7d6159.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ``parsemail.sh`` and ``parsemail-batch.sh`` scripts, found in
+    ``patchwork/bin``, will now default to using ``python`` rather than
+    ``python2`` for calling ``manage.py``. This resolves an issue when
+    Patchwork is deployed with a virtualenv.