From 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe Mon Sep 17 00:00:00 2001 From: Eli Schwartz via arch-projects Date: Tue, 29 May 2018 17:23:10 -0400 Subject: makechrootpkg: whitelist return code 14 from makepkg makepkg 5.1 implements error codes, and 14 means that installing the packages after they were built has failed. We don't care about this error and would like makechrootpkg to succeed regardless, e.g. for split packages that are mutually exclusive. Signed-off-by: Eli Schwartz --- makechrootpkg.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index 37e97e7..d81be84 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -226,6 +226,13 @@ _chrootbuild() { # ${1} is OK, but $foo or $1 isn't. # https://bugzilla.sudo.ws/show_bug.cgi?id=765 sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" + ret=$? + case $ret in + 0|14) + return 0;; + *) + return $ret;; + esac } _chrootnamcap() { -- cgit v1.2.3-70-g09d2