Skip to content

install: don't error when multiple arguments of the same type are given, instead override with last one (#8033) #8053

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
sylvestre merged 5 commits into from
Jun 28, 2025
Merged

install: don't error when multiple arguments of the same type are given, instead override with last one (#8033) #8053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7bb590
install: override previous argument rather than erroring when it occu…
jenningsfan Jun 3, 2025
fe46b1c
tests/install: don't error when multiple arguments of the same type a…
jenningsfan Jun 3, 2025
cebe062
Merge branch 'uutils:main' into main
jenningsfan Jun 3, 2025
a980055
Merge branch 'main' into main
jenningsfan Jun 4, 2025
5ba68c9
Merge branch 'main' into main
jenningsfan Jun 11, 2025
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
1 change: 1 addition & 0 deletions src/uu/install/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ pub fn uu_app() -> Command {
.about(get_message("install-about"))
.override_usage(format_usage(&get_message("install-usage")))
.infer_long_args(true)
.args_override_self(true)
.arg(backup_control::arguments::backup())
.arg(backup_control::arguments::backup_no_args())
.arg(
Expand Down
74 changes: 74 additions & 0 deletions tests/by-util/test_install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,80 @@ fn test_install_nested_paths_copy_file() {
assert!(at.file_exists(format!("{dir2}/{file1}")));
}

#[test]
fn test_multiple_mode_arguments_override_not_error() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
let dir = "source_dir";

let file = "source_file";
let gid = getegid();
let uid = geteuid();

at.touch(file);
at.mkdir(dir);

scene
.ucmd()
.args(&[
file,
&format!("{dir}/{file}"),
"--owner=invalid_owner",
"--owner",
&uid.to_string(),
])
.succeeds()
.no_stderr();

scene
.ucmd()
.args(&[
file,
&format!("{dir}/{file}"),
"-o invalid_owner",
"-o",
&uid.to_string(),
])
.succeeds()
.no_stderr();

scene
.ucmd()
.args(&[file, &format!("{dir}/{file}"), "--mode=999", "--mode=200"])
.succeeds()
.no_stderr();
Comment on lines +487 to +491
Copy link
Contributor

@hz2 hz2 Jun 9, 2025

Choose a reason for hiding this comment

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

currently testing that the command continues to succeed when overridden with duplicate argument flags, might be good to test that the override is also the last one passed through?

e.g. when you test the mode (-m) maybe you can assert that the mode is what it should be?

Copy link
Contributor Author

@jenningsfan jenningsfan Jun 29, 2025

Choose a reason for hiding this comment

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

I'm so sorry; github decided not to notify me of your comment and I've only now found it.
I'll submit a PR to do that later today.


scene
.ucmd()
.args(&[file, &format!("{dir}/{file}"), "-m 999", "-m 200"])
.succeeds()
.no_stderr();

scene
.ucmd()
.args(&[
file,
&format!("{dir}/{file}"),
"--group=invalid_group",
"--group",
&gid.to_string(),
])
.succeeds()
.no_stderr();

scene
.ucmd()
.args(&[
file,
&format!("{dir}/{file}"),
"-g invalid_group",
"-g",
&gid.to_string(),
])
.succeeds()
.no_stderr();
}

#[test]
fn test_install_failing_omitting_directory() {
let scene = TestScenario::new(util_name!());
Expand Down
Loading