From 13299af7dc6ad881adb568682a68d26fc97d4f70 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 26 2023 13:21:12 +0000 Subject: unconditionally remove pre-existing .cargo directories in cargo_prep --- diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo index 8fb798a..318698f 100644 --- a/macros.d/macros.cargo +++ b/macros.d/macros.cargo @@ -59,6 +59,7 @@ %{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\ (\ set -euo pipefail\ +%{__rm} -rf .cargo/\ %{__mkdir} -p .cargo\ cat > .cargo/config << EOF\ [build]\ diff --git a/tests/test_macros_cargo.py b/tests/test_macros_cargo.py index db98ee5..fa84918 100644 --- a/tests/test_macros_cargo.py +++ b/tests/test_macros_cargo.py @@ -58,6 +58,7 @@ def test_cargo_prep(evaluater): assert evaluater("%cargo_prep")[0].splitlines() == [ "(", "set -euo pipefail", + "/usr/bin/rm -rf .cargo/", "/usr/bin/mkdir -p .cargo", "cat > .cargo/config << EOF", "[build]", @@ -113,6 +114,7 @@ def test_cargo_prep_vendor(evaluater): assert evaluater("%cargo_prep -v vendor")[0].splitlines() == [ "(", "set -euo pipefail", + "/usr/bin/rm -rf .cargo/", "/usr/bin/mkdir -p .cargo", "cat > .cargo/config << EOF", "[build]", @@ -166,6 +168,7 @@ def test_cargo_prep_no_replacement(evaluater): assert evaluater("%cargo_prep -N")[0].splitlines() == [ "(", "set -euo pipefail", + "/usr/bin/rm -rf .cargo/", "/usr/bin/mkdir -p .cargo", "cat > .cargo/config << EOF", "[build]",