Merge pull request #597 from ckyrouac/upgrade-error-msg

jeckersb · web-flow · commit 55f1bc6da6ec · 2024-06-11T11:05:32.000-04:00
upgrade: More detailed rpm-ostree modification error msg
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
@@ -392,7 +392,7 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
             .map_or(false, |b| b.incompatible)
     {
         return Err(anyhow::anyhow!(
-            "Booted deployment contains local rpm-ostree modifications; cannot upgrade via bootc"
+            "Booted deployment contains local rpm-ostree modifications; cannot upgrade via bootc. You can run `rpm-ostree reset` to undo the modifications."
         ));
     }
     let spec = RequiredHostSpec::from_spec(&host.spec)?;

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {`
`392`	`392`	`.map_or(false, \|b\| b.incompatible)`
`393`	`393`	`{`
`394`	`394`	`return Err(anyhow::anyhow!(`
`395`		`- "Booted deployment contains local rpm-ostree modifications; cannot upgrade via bootc"`
	`395`	+ "Booted deployment contains local rpm-ostree modifications; cannot upgrade via bootc. You can run `rpm-ostree reset` to undo the modifications."
`396`	`396`	`));`
`397`	`397`	`}`
`398`	`398`	`let spec = RequiredHostSpec::from_spec(&host.spec)?;`