Skip to content

fix: resolve symlinked /bin/python3 as LinuxGlobal (Fixes #405) #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karthiknadig merged 1 commit into from
Apr 7, 2026
+39 −6
Merged

fix: resolve symlinked /bin/python3 as LinuxGlobal (Fixes #405) #413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions crates/pet-linux-global-python/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,48 @@ impl Locator for LinuxGlobalPython {

self.find_cached(None);

// We only support python environments in /bin, /usr/bin, /usr/local/bin
if !executable.starts_with("/bin")
&& !executable.starts_with("/usr/bin")
&& !executable.starts_with("/usr/local/bin")
{
// Resolve the canonical path once — used for both the path guard and cache fallback.
let canonical = fs::canonicalize(&executable).ok();

// We only support python environments in /bin, /usr/bin, /usr/local/bin.
// Check both the original and canonical paths so that symlinks from other
// locations (e.g. /bin → /usr/bin) are still accepted.
let dominated = |p: &Path| {
p.starts_with("/bin") || p.starts_with("/usr/bin") || p.starts_with("/usr/local/bin")
};
if !dominated(&executable) && !canonical.as_ref().is_some_and(|c| dominated(c)) {
return None;
}

self.reported_executables.get(&executable)
// Try direct cache lookup first.
if let Some(env) = self.reported_executables.get(&executable) {
return Some(env);
}

// If the executable wasn't found directly, resolve symlinks and try the canonical path.
// This handles cases like /bin/python3 → /usr/bin/python3 on systems where /bin
// is a symlink to /usr/bin. The cache is populated using canonicalized bin directories,
// so /bin/python3 won't be in the cache but /usr/bin/python3 will be.
if let Some(canonical) = canonical {
if canonical != executable {
if let Some(mut env) = self.reported_executables.get(&canonical) {
// Add the original path as a symlink so it's visible to consumers.
let mut symlinks = env.symlinks.clone().unwrap_or_default();
if !symlinks.contains(&executable) {
symlinks.push(executable.clone());
symlinks.sort();
symlinks.dedup();
env.symlinks = Some(symlinks);
}
// Update both the canonical and original entries for consistency.
self.reported_executables.insert(canonical, env.clone());
self.reported_executables.insert(executable, env.clone());
return Some(env);
}
}
}

None
}

fn find(&self, reporter: &dyn Reporter) {
Expand Down
Loading