Merge pull request #1127 from zooba/issue-1097

Fixes #1097 Cannot add existing virtualenv when home has no trailing backslash
microsoft · Mar 2, 2016 · c41fcbf · c41fcbf
2 parents 5475938 + f593217
commit c41fcbf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Python/Product/VSInterpreters/DerivedInterpreterFactory.cs b/Python/Product/VSInterpreters/DerivedInterpreterFactory.cs
@@ -272,11 +272,11 @@ public static IPythonInterpreterFactory FindBaseInterpreterFromVirtualEnv(
             string libPath,
             IInterpreterOptionsService service
         ) {
-            string basePath = GetOrigPrefixPath(prefixPath, libPath);
+            string basePath = CommonUtils.TrimEndSeparator(GetOrigPrefixPath(prefixPath, libPath));
 
             if (Directory.Exists(basePath)) {
                 return service.Interpreters.FirstOrDefault(interp =>
-                    CommonUtils.IsSamePath(interp.Configuration.PrefixPath, basePath)
+                    CommonUtils.IsSamePath(CommonUtils.TrimEndSeparator(interp.Configuration.PrefixPath), basePath)
                 );
             }
             return null;
@@ -298,7 +298,7 @@ public static string GetOrigPrefixPath(string prefixPath, string libPath = null)
                         .Where(m => m != null && m.Success)
                         .Select(m => m.Groups["path"])
                         .Where(g => g != null && g.Success)
-                        .Select(g => g.Value)
+                        .Select(g => g.Value.Trim())
                         .FirstOrDefault(CommonUtils.IsValidPath);
                 } catch (IOException) {
                 } catch (UnauthorizedAccessException) {
@@ -318,7 +318,7 @@ public static string GetOrigPrefixPath(string prefixPath, string libPath = null)
             if (basePath == null && File.Exists(prefixFile)) {
                 try {
                     var lines = File.ReadAllLines(prefixFile);
-                    basePath = lines.FirstOrDefault(CommonUtils.IsValidPath);
+                    basePath = (lines.FirstOrDefault(CommonUtils.IsValidPath) ?? string.Empty).Trim();
                 } catch (IOException) {
                 } catch (UnauthorizedAccessException) {
                 } catch (System.Security.SecurityException) {