fixes

Author: DonJayamanne

crates/pet-mac-commandlinetools/src/lib.rs

@@ -106,6 +106,17 @@ impl Locator for MacCmdLineTools {
         symlinks.sort();
         symlinks.dedup();
 
+        // Find other exes that are symlinks to the same exe in /Library/Developer/CommandLineTools/usr/bin
+        for exe in find_executables("/Library/Developer/CommandLineTools/usr/bin") {
+            if !symlinks.contains(&exe) {
+                if let Some(symlink) = resolve_symlink(&exe) {
+                    if symlinks.contains(&symlink) {
+                        symlinks.push(exe);
+                    }
+                }
+            }
+        }
+
         if prefix.is_none() {
             // We would have identified the symlinks by now.
             // Look for the one with the path `/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/bin/python3.9`

crates/pet/tests/ci_test.rs

@@ -305,6 +305,28 @@ fn verify_we_can_get_same_env_inf_using_from(environment: PythonEnvironment) {
     }
     // WIP.
     env.category = environment.category;
+
+    if let Some(prefix) = environment.clone().prefix {
+        if env.clone().executable == Some(PathBuf::from("/usr/local/python/current/bin/python"))
+            && (prefix.to_str().unwrap() == "/usr/local/python/current"
+                && env.clone().prefix == Some(PathBuf::from("/usr/local/python/3.10.13")))
+            || (prefix.to_str().unwrap() == "/usr/local/python/3.10.13"
+                && env.clone().prefix == Some(PathBuf::from("/usr/local/python/current")))
+        {
+            // known issue https://github.com/microsoft/python-environment-tools/issues/64
+            env.prefix = environment.clone().prefix;
+        } else if env.clone().executable
+            == Some(PathBuf::from("/home/codespace/.python/current/bin/python"))
+            && (prefix.to_str().unwrap() == "/home/codespace/.python/current"
+                && env.clone().prefix == Some(PathBuf::from("/usr/local/python/3.10.13")))
+            || (prefix.to_str().unwrap() == "/usr/local/python/3.10.13"
+                && env.clone().prefix == Some(PathBuf::from("/home/codespace/.python/current")))
+        {
+            // known issue https://github.com/microsoft/python-environment-tools/issues/64
+            env.prefix = environment.clone().prefix;
+        }
+    }
+
     assert_eq!(
         env, environment,
         "Environment mismatch for {:?}",