KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only pass VIRTUAL_ENV if it is currently active

Browse Source
This commit is contained in:
Kovid Goyal 2022-04-17 15:43:57 +05:30
parent 0ee5712e00
commit f2189b3e70
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/launch.py
View File

@ -2,6 +2,7 @@
# License: GPLv3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>
import os
from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Sequence from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Sequence
from .boss import Boss from .boss import Boss
@ -592,6 +593,10 @@ def clone_and_launch(msg: str, window: Window) -> None:
c.opts.copy_env = False c.opts.copy_env = False
if c.opts.type in ('clipboard', 'primary', 'background'): if c.opts.type in ('clipboard', 'primary', 'background'):
c.opts.type = 'window' c.opts.type = 'window'
if c.env and c.env.get('PATH') and c.env.get('VIRTUAL_ENV'):
# only pass VIRTUAL_ENV if it is currently active
if f"{c.env['VIRTUAL_ENV']}/bin" not in c.env['PATH'].split(os.pathsep):
del c.env['VIRTUAL_ENV']
is_clone_launch = serialize_env(c.shell, c.env or {}) is_clone_launch = serialize_env(c.shell, c.env or {})
ssh_kitten_cmdline = window.ssh_kitten_cmdline() ssh_kitten_cmdline = window.ssh_kitten_cmdline()
if ssh_kitten_cmdline: if ssh_kitten_cmdline: