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

ls: if acl are used, show the + in the perms #5816

Merged
merged 3 commits into from Jan 14, 2024
Merged

Conversation

sylvestre
Copy link
Sponsor Contributor

Tested by tests/mkdir/p-acl.sh

@sylvestre
Copy link
Sponsor Contributor Author

fails because we are doing much more getxattr (22 instead of 3)

@uutils uutils deleted a comment from github-actions bot Jan 9, 2024
@uutils uutils deleted a comment from github-actions bot Jan 10, 2024
@uutils uutils deleted a comment from github-actions bot Jan 10, 2024
@sylvestre sylvestre marked this pull request as ready for review January 10, 2024 17:52
@uutils uutils deleted a comment from github-actions bot Jan 10, 2024
@sylvestre
Copy link
Sponsor Contributor Author

I think it is now good
I can see that the line is covered (setfacl is installed on the runners by default)
https://app.codecov.io/gh/uutils/coreutils/pull/5816/blob/src/uu/ls/src/ls.rs#L2625

@sylvestre
Copy link
Sponsor Contributor Author

and I realized that GNU isn't testing this. So, I added a test upstream:
coreutils/coreutils@b09dc63

@cakebaker
Copy link
Contributor

cakebaker commented Jan 11, 2024

I don't know whether you have seen it: some ls tests fail on Android because of the "+" in the output.

@sylvestre
Copy link
Sponsor Contributor Author

I missed it, thanks :)

tests/by-util/test_ls.rs Outdated Show resolved Hide resolved
tests/by-util/test_ls.rs Outdated Show resolved Hide resolved
src/uu/ls/src/ls.rs Outdated Show resolved Hide resolved
src/uu/ls/src/ls.rs Outdated Show resolved Hide resolved
Tested by tests/mkdir/p-acl.sh
@cakebaker
Copy link
Contributor

Needs a rebase :|

Copy link

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

@cakebaker cakebaker merged commit e01d5f7 into uutils:main Jan 14, 2024
59 of 61 checks passed
@sylvestre sylvestre deleted the acl branch January 14, 2024 15:23
sylvestre added a commit to sylvestre/coreutils that referenced this pull request Jan 19, 2024
* ls: if acl are used, show the + in the perms

Tested by tests/mkdir/p-acl.sh

* CICD.yml: fix small formatting issue

---------

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants