From 151cae0f5884ba4a36ac7038596e7967b9f8c87b Mon Sep 17 00:00:00 2001 From: default Date: Thu, 25 Jul 2024 09:45:01 +0800 Subject: [PATCH] rename config.example.toml to bootstrap.example.toml --- REUSE.toml | 2 +- src/bootstrap/src/core/config/config.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index 1a30d8016c9ea..e1904b5b10920 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -22,7 +22,7 @@ path = [ "Cargo.lock", "Cargo.toml", "CODE_OF_CONDUCT.md", - "config.example.toml", + "bootstrap.example.toml", "configure", "CONTRIBUTING.md", "COPYRIGHT", diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 6d713f2dad4ac..2053c02110ee6 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -1315,7 +1315,7 @@ impl Config { let mut toml_path = toml_path.unwrap_or_else(|| PathBuf::from("bootstrap.toml")); if using_default_path && !toml_path.exists() { toml_path = PathBuf::from("config.toml"); - if using_default_path && !toml_path.exists() { + if !toml_path.exists() { toml_path = config.src.join(PathBuf::from("bootstrap.toml")); if !toml_path.exists() { toml_path = config.src.join(PathBuf::from("config.toml"));