Merge pull request #848 from aawilson/python_builder_compat

Remove a cross-platform compat bug in python builder
DamnWidget · Mar 9, 2020 · 261513c · 261513c
2 parents 2463829 + 06a5e0c
commit 261513c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/anaconda_lib/builder/python_builder.py b/anaconda_lib/builder/python_builder.py
@@ -68,7 +68,7 @@ def _parse_tpl(self, cmd):
 
         template_file = os.path.join(
             os.path.dirname(__file__),
-            '../../', 'templates', 'python_build.tpl'
+            '..', '..', 'templates', 'python_build.tpl'
         )
         with open(template_file, 'r', encoding='utf8') as tplfile:
             template = Template(tplfile.read())

diff --git a/anaconda_lib/workers/interpreter.py b/anaconda_lib/workers/interpreter.py
@@ -151,7 +151,13 @@ def __extract_python_interpreter(self, view):
                     os.path.expandvars(get_interpreter(view))
                 )
             )
-            python = urldata.path
+
+            if len(urldata.scheme) == 1:
+                # Assume this comes from a Windows path if scheme is a single character
+                python = os.path.join('{}:'.format(urldata.scheme), urldata.path)
+            else:
+                python = urldata.path
+
             if '$VIRTUAL_ENV' in python:
                 Log.warning(
                     'WARNING: your anaconda configured python interpreter '