Skip to content

Commit 32232cf

Browse files
committed
Pass failed version upgrade message to output
1 parent e50e42b commit 32232cf

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ fn main() -> io::Result<()> {
170170
}
171171

172172
let old_version = settings.version.clone();
173-
if let Err(()) = settings.try_upgrade() {
173+
if let Err(msg) = settings.try_upgrade() {
174174
error!(
175-
"Your settings are out of date and require manual intervention. Your version: {old_version}, latest: {}. See {} for instructions.",
175+
"Your settings are out of date and require manual intervention: {msg}. Your version: {old_version}, latest: {}. See {} for instructions.",
176176
Version::latest(),
177177
env!("CARGO_PKG_REPOSITORY"),
178178
);

web/src/forms/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ pub fn import_export_modal() -> Html {
280280
Ok(mut settings) => {
281281
let old_version = settings.version.clone();
282282
import_state.set(Some(
283-
if let Err(()) = settings.try_upgrade() {
283+
if let Err(msg) = settings.try_upgrade() {
284284
Err(format!(
285-
"Your imported settings are out of date and require manual intervention. \
285+
"Your imported settings are out of date and require manual intervention: {msg}. \
286286
Your version: {old_version}, latest: {}. \
287287
See {} for instructions.",
288288
Version::latest(),

0 commit comments

Comments
 (0)