From 00e377a3d7ba40c80a4646453de07a1d2c7a27a6 Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Mon, 1 Mar 2021 15:24:26 -0500 Subject: Check if in virtualenv before dependency installation --- python/scriptingprovider.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'python/scriptingprovider.py') diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py index 3205826b..fea6b218 100644 --- a/python/scriptingprovider.py +++ b/python/scriptingprovider.py @@ -28,6 +28,7 @@ import sys import subprocess from pathlib import Path, PurePath import re +import os # Binary Ninja components import binaryninja @@ -936,7 +937,8 @@ class PythonScriptingProvider(ScriptingProvider): args.append("install") args.append("--verbose") venv = Settings().get_string("python.virtualenv") - if venv is not None and venv.endswith("site-packages") and Path(venv).is_dir(): + in_virtual_env = 'VIRTUAL_ENV' in os.environ + if venv is not None and venv.endswith("site-packages") and Path(venv).is_dir() and not in_virtual_env: args.extend(["--target", venv]) args.extend(filter(len, modules.decode("utf-8").split("\n"))) -- cgit v1.3.1