|
 |
da2616f |
From cccc709c085890633be767a44465229d049d5941 Mon Sep 17 00:00:00 2001
|
|
|
da2616f |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
da2616f |
Date: Wed, 13 Feb 2019 13:06:36 +0100
|
|
|
da2616f |
Subject: [PATCH] Do not try to run /usr/bin/python
|
|
|
da2616f |
|
|
|
da2616f |
On modern linux distros, /usr/bin/python will usually either
|
|
|
da2616f |
refer to python2 or not exists at all. Use sys.executable to
|
|
|
da2616f |
run subprocess calls with the same python executable as the
|
|
|
da2616f |
parent process.
|
|
|
da2616f |
---
|
|
|
da2616f |
conda/common/path.py | 7 +++++--
|
|
|
da2616f |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
da2616f |
|
|
|
da2616f |
diff --git a/conda/common/path.py b/conda/common/path.py
|
|
|
da2616f |
index b51f7f272d..06e0b4bc9a 100644
|
|
|
da2616f |
--- a/conda/common/path.py
|
|
|
da2616f |
+++ b/conda/common/path.py
|
|
|
da2616f |
@@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
|
|
|
da2616f |
from functools import reduce
|
|
|
da2616f |
from logging import getLogger
|
|
|
da2616f |
import os
|
|
|
da2616f |
+import sys
|
|
|
da2616f |
from os.path import abspath, basename, expanduser, expandvars, join, normcase, split, splitext
|
|
|
da2616f |
import re
|
|
|
da2616f |
import subprocess
|
|
|
da2616f |
@@ -155,9 +156,11 @@ def parse_entry_point_def(ep_definition):
|
|
|
da2616f |
def get_python_short_path(python_version=None):
|
|
|
da2616f |
if on_win:
|
|
|
da2616f |
return "python.exe"
|
|
|
da2616f |
- if python_version and '.' not in python_version:
|
|
|
da2616f |
+ if not python_version:
|
|
|
da2616f |
+ return sys.executable
|
|
|
da2616f |
+ if '.' not in python_version:
|
|
|
da2616f |
python_version = '.'.join(python_version)
|
|
|
da2616f |
- return join("bin", "python%s" % (python_version or ''))
|
|
|
da2616f |
+ return join("bin", "python" + python_version)
|
|
|
da2616f |
|
|
|
da2616f |
|
|
|
da2616f |
def get_python_site_packages_short_path(python_version):
|
|
|
da2616f |
--
|
|
|
da2616f |
2.19.2
|
|
|
da2616f |
|