From 932dedcdf68509ad3a9bb792f0256cab94646ad7 Mon Sep 17 00:00:00 2001
From: fitermay <fiterman@gmail.com>
Date: Wed, 21 Mar 2018 23:57:07 -0400
Subject: [PATCH] PY-29092: Merge env vars instead of overriding in console
 debugger

---
 python/helpers/pydev/_pydev_bundle/pydev_console_utils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py b/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py
index 5670381c0228..33751922f044 100644
--- a/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py
+++ b/python/helpers/pydev/_pydev_bundle/pydev_console_utils.py
@@ -573,7 +573,12 @@ class BaseInterpreterInterface:
         env_key = "PYDEVD_EXTRA_ENVS"
         if env_key in debugger_options:
             for (env_name, value) in dict_iter_items(debugger_options[env_key]):
-                os.environ[env_name] = value
+                existing_value = os.environ.get(env_name, None)
+                if existing_value:
+                    os.environ[env_name] = "%s%c%s" % (existing_value, os.path.pathsep, value)
+                else:
+                    os.environ[env_name] = value
+
             del debugger_options[env_key]
         def do_connect_to_debugger():
             try: