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

df: read block size from env vars #3504

Merged
merged 1 commit into from
May 25, 2022

Conversation

cakebaker
Copy link
Contributor

Reads the block size from one of the following env vars: DF_BLOCK_SIZE, BLOCK_SIZE, or BLOCKSIZE. The --block-size argument takes precedence over the env vars.

tests/by-util/test_df.rs Show resolved Hide resolved
@jfinkels
Copy link
Collaborator

jfinkels commented May 8, 2022

Oh, it looks like there is an error in the GNU test suite:

Error: GNU test failed: tests/df/df-P. tests/df/df-P is passing on 'main'. Maybe you have to rebase?

@cakebaker cakebaker force-pushed the read_blocksize_from_env_vars branch from 85ca982 to e3b08e3 Compare May 9, 2022 06:12
@cakebaker
Copy link
Contributor Author

Hm, that's because -P is not yet implemented. I guess I have to implement its block size handling first before this PR can be merged...

@sylvestre sylvestre force-pushed the read_blocksize_from_env_vars branch from e3b08e3 to c06cf63 Compare May 11, 2022 10:59
@sylvestre
Copy link
Contributor

It is now conflicting, could you please fix that ? :)
thanks

@cakebaker cakebaker force-pushed the read_blocksize_from_env_vars branch from c06cf63 to a9b40f8 Compare May 12, 2022 08:51
@cakebaker
Copy link
Contributor Author

cakebaker commented May 12, 2022

Ok, I fixed the merge conflict. In addition, the environment vars are now ignored when using the POSIX portability mode (-P), which is a part of #3511.

@cakebaker cakebaker force-pushed the read_blocksize_from_env_vars branch 2 times, most recently from 31ccd09 to 02a1fe3 Compare May 20, 2022 12:35
@cakebaker cakebaker force-pushed the read_blocksize_from_env_vars branch from 02a1fe3 to ea284ce Compare May 23, 2022 07:25
@sylvestre sylvestre merged commit 172f5c4 into uutils:main May 25, 2022
@cakebaker cakebaker deleted the read_blocksize_from_env_vars branch May 26, 2022 05:36
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.

3 participants