aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch
blob: 5426f620177fbb929e7c7ab63b406e6444709c89 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
From 6bcb2c2b0860779dc44d8dd27259f9edc6c9e6e8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 21 Nov 2019 16:29:52 +0100
Subject: [PATCH] libalpine: use correct exit code in trap

save exit state before cleaning up tempdir so we get the correct exit
code.

This fixes the problem where lbu exit with success on errors where disk
is full or similar.
---
 libalpine.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libalpine.sh.in b/libalpine.sh.in
index f3857e2..d7b79fa 100644
--- a/libalpine.sh.in
+++ b/libalpine.sh.in
@@ -50,7 +50,7 @@ init_tmpdir() {
 	local __tmpd="/tmp/$PROGRAM-${$}-$(date +%s)-$RANDOM"
 	umask 077 || die "umask"
 	mkdir -p "$__tmpd" || exit 1
-	trap "rm -fr \"$__tmpd\"; exit" 0
+	trap "rc=\$?; rm -fr \"$__tmpd\"; exit \$rc" 0
 	umask $omask
 	eval "$1=\"$__tmpd\""
 }
-- 
2.24.0