Skip to content

Commit e338a3e

Browse files
alialnustephenfin
authored andcommitted
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 951a58e)
1 parent b80ee7a commit e338a3e

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

patchwork/bin/parsemail-batch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ BIN_DIR=$(dirname "$0")
2323
PATCHWORK_BASE=$(readlink -e "$BIN_DIR/../..")
2424

2525
if [ -z "$PW_PYTHON" ]; then
26-
PW_PYTHON=python2
26+
PW_PYTHON=python
2727
fi
2828

2929
if [ -z "$DJANGO_SETTINGS_MODULE" ]; then

patchwork/bin/parsemail.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ BIN_DIR=$(dirname "$0")
2323
PATCHWORK_BASE=$(readlink -e "$BIN_DIR/../..")
2424

2525
if [ -z "$PW_PYTHON" ]; then
26-
PW_PYTHON=python2
26+
PW_PYTHON=python
2727
fi
2828

2929
if [ -z "$DJANGO_SETTINGS_MODULE" ]; then
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
The ``parsemail.sh`` and ``parsemail-batch.sh`` scripts, found in
5+
``patchwork/bin``, will now default to using ``python`` rather than
6+
``python2`` for calling ``manage.py``. This resolves an issue when
7+
Patchwork is deployed with a virtualenv.

0 commit comments

Comments
 (0)