From ae685888401071265a78a05703ca66a050101484 Mon Sep 17 00:00:00 2001 From: eatradish Date: Tue, 28 May 2024 16:44:53 +0800 Subject: [PATCH] Reapply "feat: add more debug info" This reverts commit a6c270d0a7730ee477648bf2dabaaa305e94473e. --- buildit-utils/src/lib.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/buildit-utils/src/lib.rs b/buildit-utils/src/lib.rs index a840438..00ac8fd 100644 --- a/buildit-utils/src/lib.rs +++ b/buildit-utils/src/lib.rs @@ -1,6 +1,6 @@ use crate::github::{find_version_by_packages, print_stdout_and_stderr, update_abbs}; use abbs_update_checksum_core::get_new_spec; -use anyhow::{anyhow, bail, Context}; +use anyhow::{bail, Context}; use github::get_spec; use once_cell::sync::Lazy; use std::{ @@ -168,15 +168,19 @@ async fn write_new_spec(abbs_path_shared: PathBuf, pkg_shared: String) -> anyhow let (mut spec, p) = spawn_blocking(move || get_spec(&abbs_path_shared, &pkg_shared)).await??; for i in 1..=5 { - match get_new_spec(&mut spec).await.map_err(|e| anyhow!("{e}")) { + match get_new_spec(&mut spec).await { Ok(()) => { + if i > 1 { + info!("({i}/5) Retrying to get new spec..."); + } + fs::write(p, spec).await?; return Ok(()); } Err(e) => { error!("Failed to get new spec: {e}"); if i == 5 { - return Err(e); + bail!("{e}"); } } }