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.

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

Jump to bottom

Change "enable replacement" error text to "allow replacement" to match command-line interface #4869

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Change "enable replacement" error text to "allow replacement" to match command-line interface #4869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbee718
Update apply-live test
ianloic Mar 11, 2024
96edaf8
Update live.rs
ianloic Mar 11, 2024
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
4 changes: 2 additions & 2 deletions rust/src/live.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,14 @@ pub(crate) fn transaction_apply_live(
if !allow_replacement {
if pkgdiff.n_removed() > 0 {
return Err(anyhow!(
"packages would be removed: {}, enable replacement to override",
"packages would be removed: {}, allow replacement to override",
pkgdiff.n_removed()
)
.into());
}
if pkgdiff.n_modified() > 0 {
return Err(anyhow!(
"packages would be changed: {}, enable replacement to override",
"packages would be changed: {}, allow replacement to override",
pkgdiff.n_modified()
)
.into());
Expand Down
2 changes: 1 addition & 1 deletion tests/kolainst/destructive/apply-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ rpmostree_assert_status '.deployments|length == 2' \
if rpm-ostree apply-live 2>err.txt; then
fatal "live-removed foo"
fi
assert_file_has_content_literal err.txt 'packages would be removed: 1, enable replacement to override'
assert_file_has_content_literal err.txt 'packages would be removed: 1, allow replacement to override'
# Ensure remote error is stripped
assert_not_file_has_content_literal err.txt 'GDBus.Error'
rpm-ostree ex livefs --allow-replacement | tee out.txt
Expand Down
Loading