Skip to content
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.

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

only parse /bin/sh (not /bin/ls) #1493

Merged
merged 2 commits into from
Feb 16, 2024
Merged

only parse /bin/sh (not /bin/ls) #1493

merged 2 commits into from
Feb 16, 2024

Conversation

BurntSushi
Copy link
Member

It turns out that /bin/ls can sometimes be plain text file. For
example, in Rocky Linux 9:

$ cat /bin/ls
#!/usr/bin/coreutils --coreutils-prog-shebang=ls

However, /bin/sh is an ELF binary:

$ file /bin/sh
/bin/sh: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=7acbb41bf6f1b7d977f1b44675bf3ed213776835, for GNU/Linux 3.2.0, stripped

In a related issue (#1433), @zanieb fixed #1395 where, on NixOS,
/bin/ls doesn't exist but /bin/sh does. However, the fix attempts
/bin/ls first and only tries /bin/sh if /bin/ls doesn't exist. If
/bin/ls exists but isn't a valid ELF file, then the entire enterprise
gives up and uv fails to detect the version of libc that is
installed.

Instead of tweaking the logic to keep trying /bin/ls and then
/bin/sh after even if parsing /bin/ls fails, we just switch over to
reading /bin/sh only. It seems like a more fundamental thing to sniff
and likely less error prone.

We can adjust this heuristic as needed if it provdes to be problematic.

I tested this fix manually on Rocky Linux 9 via Docker:

$ cross b -r -p uv --target x86_64-unknown-linux-musl
$ cp target/x86_64-unknown-linux-musl/release/uv ~/astral/issues/uv/i1486/uv
$ docker run --rm -it --mount type=bind,src=/home/andrew/astral/issues/uv/i1486,dst=/host rockylinux:9 bash
[root@df2baa65d2f8 /]# /host/uv venv
Using Python 3.9.18 interpreter at /usr/bin/python3.9
Creating virtualenv at: .venv
[root@df2baa65d2f8 /]#

Fixes #1486, Ref #1433

Copy link
Member

@zanieb zanieb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I wasn't sure about this in the first place.

@zanieb zanieb added the bug Something isn't working label Feb 16, 2024
@BurntSushi BurntSushi merged commit 67cde15 into main Feb 16, 2024
7 checks passed
@BurntSushi BurntSushi deleted the ag/fix-i1486 branch February 16, 2024 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
2 participants