From 74be214e8185c188ef6c1abf3e6dd0adadf5b794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 4 Aug 2015 17:07:06 +0300
Subject: [PATCH] Fixed #25221 -- Prevented django_bash_completion from leaking
variables into the environment.
---
extras/django_bash_completion | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
index 3e02d8ef3a..1fac9ea2aa 100755
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -42,10 +42,10 @@ complete -F _django_completion -o default django-admin.py manage.py django-admin
_python_django_completion()
{
if [[ ${COMP_CWORD} -ge 2 ]]; then
- PYTHON_EXE=${COMP_WORDS[0]##*/}
+ local PYTHON_EXE=${COMP_WORDS[0]##*/}
echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
if [[ $? == 0 ]]; then
- PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+ local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
if [[ $? == 0 ]]; then
COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
@@ -63,9 +63,11 @@ if command -v whereis &>/dev/null; then
for python in $python_interpreters; do
pythons="${pythons} ${python##*/}"
done
+ unset python_interpreters
pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
else
pythons=python
fi
complete -F _python_django_completion -o default $pythons
+unset pythons