From 713e89a6c50ce461fc91245463974635f4940772 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Thu, 28 Nov 2024 16:07:41 +0300 Subject: Don't error on nonexistent TOML imports in migrate YAML import migration was already properly ignoring nonexistent imports, it was only missed for TOML ones. Fixes #8330. --- CHANGELOG.md | 1 + alacritty/src/migrate/mod.rs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15bdaa2b..ed471ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Notable changes to the `alacritty_terminal` crate are documented in its - Hint launcher opening arbitrary text, when terminal content changed while opening - `SemanticRight`/`SemanticLeft` vi motions breaking with wide semantic escape characters - `alacritty migrate` crashing with recursive toml imports +- Migrating nonexistent toml import breaking the entire migration ## 0.14.0 diff --git a/alacritty/src/migrate/mod.rs b/alacritty/src/migrate/mod.rs index ffba25f0..bfa72294 100644 --- a/alacritty/src/migrate/mod.rs +++ b/alacritty/src/migrate/mod.rs @@ -151,6 +151,14 @@ fn migrate_imports( // Migrate each import. for import in imports.into_iter().filter_map(|item| item.as_str()) { let normalized_path = config::normalize_import(path, import); + + if !normalized_path.exists() { + if options.dry_run { + println!("Skipping migration for nonexistent path: {}", normalized_path.display()); + } + continue; + } + let migration = migrate_config(options, &normalized_path, recursion_limit - 1)?; if options.dry_run { println!("{}", migration.success_message(true)); -- cgit v1.2.3-54-g00ecf