Skip to content

cksum: Move --check confliction to clap #10028

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

Closed
oech3 wants to merge 1 commit into from
Closed

cksum: Move --check confliction to clap #10028

Show file tree
Hide file tree
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
11 changes: 3 additions & 8 deletions src/uu/cksum/src/cksum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
return Err(ChecksumError::AlgorithmNotSupportedWithCheck.into());
}

let text_flag = matches.get_flag(options::TEXT);
let binary_flag = matches.get_flag(options::BINARY);
let tag = matches.get_flag(options::TAG);

if tag || binary_flag || text_flag {
return Err(ChecksumError::BinaryTextConflict.into());
}

// Execute the checksum validation based on the presence of files or the use of stdin

let verbose = ChecksumVerbose::new(status, quiet, warn);
Expand Down Expand Up @@ -251,6 +243,9 @@ pub fn uu_app() -> Command {
.short('c')
.long(options::CHECK)
.help(translate!("cksum-help-check"))
.conflicts_with(options::TAG)
.conflicts_with(options::BINARY)
.conflicts_with(options::TEXT)
.action(ArgAction::SetTrue),
)
.arg(
Expand Down
4 changes: 2 additions & 2 deletions tests/by-util/test_cksum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,7 @@ fn test_conflicting_options() {
.fails_with_code(1)
.no_stdout()
.stderr_contains(
"cksum: the --binary and --text options are meaningless when verifying checksums",
"cannot be used with", //clap generated error
);

scene
Expand All @@ -1228,7 +1228,7 @@ fn test_conflicting_options() {
.fails_with_code(1)
.no_stdout()
.stderr_contains(
"cksum: the --binary and --text options are meaningless when verifying checksums",
"cannot be used with", //clap generated error
);
}

Expand Down
Loading