From c9ad7b163e482eb79b6a7960af72f3d82260a0ca Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sep 22 2023 23:48:43 +0000 Subject: %cargo_prep: remove Cargo.toml.orig unconditionally Cargo.lock should only be removed when using unbundled sources, but it's a good idea to remove Cargo.toml.orig all the time to prevent spurious errors. --- diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo index 18a3360..2a23efc 100644 --- a/macros.d/macros.cargo +++ b/macros.d/macros.cargo @@ -83,7 +83,6 @@ registry = "https://crates.io"\ replace-with = "local-registry"\ EOF\ %{__rm} -f Cargo.lock\ -%{__rm} -f Cargo.toml.orig\ }\ %{-v:\ cat >> .cargo/config << EOF\ @@ -92,8 +91,9 @@ directory = "%{-v*}"\ \ [source.crates-io]\ replace-with = "vendored-sources"\ -EOF\ -}}) +EOF}}\ +%{__rm} -f Cargo.toml.orig\ +) # __cargo_parse_opts: function-like macro which parses common flags into the # equivalent command-line flags for cargo