From 7bdc720a9a84bfead498ae7a64868cd67506eae4 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 22 Jul 2022 22:59:02 +1000 Subject: [PATCH] Fix updating metafiles: Skip on custom install path Signed-off-by: Jiahao XU --- src/main.rs | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2061ee8d..22659542 100644 --- a/src/main.rs +++ b/src/main.rs @@ -241,6 +241,7 @@ async fn entry(jobserver_client: LazyJobserverClient) -> Result<()> { let desired_targets = get_desired_targets(&opts.targets); // Compute install directory + let custom_install_path = opts.install_path.is_some(); let install_path: Arc = Arc::from( get_install_path(opts.install_path.as_deref()).ok_or_else(|| { error!("No viable install path found of specified, try `--install-path`"); @@ -338,27 +339,29 @@ async fn entry(jobserver_client: LazyJobserverClient) -> Result<()> { } block_in_place(|| { - debug!("Writing .crates.toml"); - metafiles::v1::CratesToml::append( - metadata_vec - .iter() - .map(|metadata| (&metadata.cvs, metadata.bins.clone())), - )?; + if !custom_install_path { + debug!("Writing .crates.toml"); + metafiles::v1::CratesToml::append( + metadata_vec + .iter() + .map(|metadata| (&metadata.cvs, metadata.bins.clone())), + )?; - debug!("Writing .crates2.json"); - metafiles::v2::Crates2Json::append(metadata_vec.into_iter().map(|metadata| { - ( - metadata.cvs, - metafiles::v2::CrateInfo { - version_req: Some(metadata.version_req), - bins: metadata.bins, - profile: "release".into(), - target: metadata.target, - rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")), - ..Default::default() - }, - ) - }))?; + debug!("Writing .crates2.json"); + metafiles::v2::Crates2Json::append(metadata_vec.into_iter().map(|metadata| { + ( + metadata.cvs, + metafiles::v2::CrateInfo { + version_req: Some(metadata.version_req), + bins: metadata.bins, + profile: "release".into(), + target: metadata.target, + rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")), + ..Default::default() + }, + ) + }))?; + } if opts.no_cleanup { // Consume temp_dir without removing it from fs.