Merge pull request #951 from zooba/issue-944-221

Fixes #944 All environments disappeared
microsoft · Nov 5, 2015 · 66584ee · 66584ee
2 parents 0bfbf95 + fb0a07e
commit 66584ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Python/Product/Analysis/Interpreter/InterpreterFactoryCreator.cs b/Python/Product/Analysis/Interpreter/InterpreterFactoryCreator.cs
@@ -16,6 +16,7 @@
 using System.IO;
 using System.Reflection;
 using Microsoft.PythonTools.Interpreter.Default;
+using Microsoft.VisualStudioTools;
 
 namespace Microsoft.PythonTools.Interpreter {
     /// <summary>
@@ -32,7 +33,7 @@ public static PythonInterpreterFactoryWithDatabase CreateInterpreterFactory(Inte
             var description = options.Description ?? string.Format("Unknown Python {0}", ver);
             var prefixPath = options.PrefixPath;
             if (string.IsNullOrEmpty(prefixPath) && !string.IsNullOrEmpty(options.InterpreterPath)) {
-                prefixPath = Path.GetDirectoryName(options.InterpreterPath);
+                prefixPath = CommonUtils.GetParent(options.InterpreterPath);
             }
 
             return new CPythonInterpreterFactory(

diff --git a/Python/Product/EnvironmentsList/PipExtensionProvider.cs b/Python/Product/EnvironmentsList/PipExtensionProvider.cs
@@ -244,7 +244,7 @@ private bool ShouldElevate {
         public bool CanExecute {
             get {
                 if (_factory == null || _factory.Configuration == null ||
-                    string.IsNullOrEmpty(_factory.Configuration.InterpreterPath)) {
+                    !File.Exists(_factory.Configuration.InterpreterPath)) {
                     return false;
                 }
 
@@ -254,7 +254,7 @@ public bool CanExecute {
 
         private void AbortOnInvalidConfiguration() {
             if (_factory == null || _factory.Configuration == null ||
-                string.IsNullOrEmpty(_factory.Configuration.InterpreterPath)) {
+                !File.Exists(_factory.Configuration.InterpreterPath)) {
                 throw new InvalidOperationException(Resources.MisconfiguredEnvironment);
             }
         }