From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 25 Dec 2023 19:07:09 +0000 (+0100)
Subject: [3.12] gh-112252: Fix error on unset $OSNAME in venv/activate (GH-112253) (GH-112297)
X-Git-Tag: v3.12.2~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c07540e7d2a271d09bcca2f7731a8c60cd38350;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-112252: Fix error on unset $OSNAME in venv/activate (GH-112253) (GH-112297)

(cherry picked from commit e1540ae74d1fce62f53e25838ba21746ba5d8444)

Co-authored-by: James Turk <dev@jamesturk.net>
---

diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate
index 91650661db08..d5914e0cbb40 100644
--- a/Lib/venv/scripts/common/activate
+++ b/Lib/venv/scripts/common/activate
@@ -36,7 +36,7 @@ deactivate () {
 deactivate nondestructive
 
 # on Windows, a path can contain colons and backslashes and has to be converted:
-if [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ] ; then
+if [ "${OSTYPE:-}" = "cygwin" ] || [ "${OSTYPE:-}" = "msys" ] ; then
     # transform D:\path\to\venv to /d/path/to/venv on MSYS
     # and to /cygdrive/d/path/to/venv on Cygwin
     export VIRTUAL_ENV=$(cygpath "__VENV_DIR__")