summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2024-03-04 11:37:20 +0300
committerCaleb Maclennan2024-03-04 12:58:55 +0300
commit7e66139a9e920ee00ae664228b5bf88adfa9c854 (patch)
tree237abcef324174c0d01e689628f9cfd046d76f5d
parent5461af251306a612a12ad0e6452395b94b146057 (diff)
downloadaur-7e66139a9e920ee00ae664228b5bf88adfa9c854.tar.gz
Always remove targets during source prep so build can run outside of chroots
-rw-r--r--PKGBUILD2
-rw-r--r--makepkg-source-roller.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 27984010618d..bc6e246de1b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -222,7 +222,7 @@ sha256sums=('SKIP'
'1808df5ba4d1e2f9efa07ac6b510bec866fa6d60e44505d82aea3f6072105a71'
'893bc04c7fceba2f0a7195ed48551d55f066bbc530ec934c89c55768e6f3949c'
'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f'
- '68a0f35a9c52411bd1cce55210d7c06a528607a5e5cc32117f3a2ea658d850aa'
+ '3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224'
'SKIP'
'SKIP'
'SKIP'
diff --git a/makepkg-source-roller.py b/makepkg-source-roller.py
index 53e2d11d95a0..d4d3a99f9c71 100644
--- a/makepkg-source-roller.py
+++ b/makepkg-source-roller.py
@@ -225,8 +225,8 @@ place_subproject_into_tree () {
if [[ -n "$parent_dir" ]]; then
mkdir -p "$parent_dir"
fi
- # Remove the target dir only if it's empty
- rm -df "$2"
+ # Remove the target dir
+ rm -rf "$2"
if [[ "$3" == "true" ]]; then
cp -r "$1" "$2"
else