Pass failed version upgrade message to output

sameer · Aug 6, 2024 · 32232cf · 32232cf
1 parent e50e42b
commit 32232cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -170,9 +170,9 @@ fn main() -> io::Result<()> {
  }
 
  let old_version = settings.version.clone();
- if let Err(()) = settings.try_upgrade() {
+ if let Err(msg) = settings.try_upgrade() {
  error!(
- "Your settings are out of date and require manual intervention. Your version: {old_version}, latest: {}. See {} for instructions.",
+ "Your settings are out of date and require manual intervention: {msg}. Your version: {old_version}, latest: {}. See {} for instructions.",
  Version::latest(),
  env!("CARGO_PKG_REPOSITORY"),
  );

diff --git a/web/src/forms/mod.rs b/web/src/forms/mod.rs
@@ -280,9 +280,9 @@ pub fn import_export_modal() -> Html {
  Ok(mut settings) => {
  let old_version = settings.version.clone();
  import_state.set(Some(
- if let Err(()) = settings.try_upgrade() {
+ if let Err(msg) = settings.try_upgrade() {
  Err(format!(
- "Your imported settings are out of date and require manual intervention. \
+ "Your imported settings are out of date and require manual intervention: {msg}. \
  Your version: {old_version}, latest: {}. \
  See {} for instructions.",
  Version::latest(),