1915a138c0
Same as #4584 but with an additional backport: https://github.com/msys2/msys2-pacman/pull/49 Old message: See msys2/msys2-pacman#45 makepkg.conf synced with the upstream version: https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/etc/makepkg.conf.in Skip patches only changing CI configs
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 2c898ec90c926510f23350c2780de99a7fad53b6 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Tue, 28 Feb 2023 20:24:16 +0100
|
|
Subject: [PATCH 01/N] makepkg: clean up more things
|
|
|
|
---
|
|
scripts/makepkg.sh.in | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
|
|
index 2c36681..44025e6 100644
|
|
--- a/scripts/makepkg.sh.in
|
|
+++ b/scripts/makepkg.sh.in
|
|
@@ -137,7 +137,7 @@ clean_up() {
|
|
|
|
# If it's a clean exit and -c/--clean has been passed...
|
|
msg "$(gettext "Cleaning up...")"
|
|
- rm -rf "$pkgdirbase" "$srcdir"
|
|
+ rm -rf "$pkgdirbase" "$srcdir" "$destdir"
|
|
if [[ -n $pkgbase ]]; then
|
|
local fullver=$(get_full_version)
|
|
# Can't do this unless the BUILDSCRIPT has been sourced.
|
|
@@ -846,6 +846,11 @@ restore_package_variables() {
|
|
|
|
run_single_packaging() {
|
|
local pkgdir="$pkgdirbase/$pkgname"
|
|
+ # clean existing pkg directory
|
|
+ if [[ -d "$pkgdir" ]]; then
|
|
+ msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/"
|
|
+ rm -rf "$pkgdir"
|
|
+ fi
|
|
mkdir "$pkgdir"
|
|
if [[ -n $1 ]] || (( PKGFUNC )); then
|
|
run_package $1
|