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>

diff --git a/patchwork/bin/parsemail-batch.sh b/patchwork/bin/parsemail-batch.sh
index 3d3725c6f792a6ff182d7d29a26fdac68057a4d0..8928d0a333a1b2fea307de9b86c4aabaa5a8c82a 100755 (executable)
--- 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 a742f60e54324ab8cf99a33dbd1560ed543def04..c9c9b6a1d5ace2429052c1c14fbcee4b5854dded 100755 (executable)
--- 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 (file)
index 0000000..f002656
--- /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.