Merge pull request coreos#4869 from ianloic/allow-replacement-text

HuijingHei · Mar 13, 2024 · 5441b8f · 5441b8f
2 parents ae87efc + 96edaf8
commit 5441b8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rust/src/live.rs b/rust/src/live.rs
@@ -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());

diff --git a/tests/kolainst/destructive/apply-live b/tests/kolainst/destructive/apply-live
@@ -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