From: Dima <43349662+d-goldin@users.noreply.github.com>
Date: Tue, 14 Jan 2020 20:47:59 +0000 (+0100)
Subject: venv: Suppress warning message when bash hashing is disabled. (GH-17966)
X-Git-Tag: v3.9.0a3~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b0d91aab4cfba30a2a9728e9eaea15dbc0ba9bd;p=thirdparty%2FPython%2Fcpython.git

venv: Suppress warning message when bash hashing is disabled. (GH-17966)

When using python's built-in venv activaton script
warnings are printed when hashing is disabled in
bash or zsh, like;

`bash: hash: hashing disabled`

This output is not really useful to the end-user and has
been disabled in `virtualenv` for long.

This commit is based on:
https://github.com/pypa/virtualenv/commit/28e85bcd80d04b2a7ebce0e1d0b02d432b7e5593
---

diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate
index b1b4625fdddc..45af3536aa19 100644
--- a/Lib/venv/scripts/common/activate
+++ b/Lib/venv/scripts/common/activate
@@ -18,7 +18,7 @@ deactivate () {
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
     if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-        hash -r
+        hash -r 2> /dev/null
     fi
 
     if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
@@ -62,5 +62,5 @@ fi
 # be called to get it to forget past commands.  Without forgetting
 # past commands the $PATH changes we made may not be respected
 if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-    hash -r
+    hash -r 2> /dev/null
 fi