[arch-projects] [devtools] [PATCH] makechrootpkg: whitelist return code 14 from makepkg

Eli Schwartz eschwartz at archlinux.org
Tue May 29 21:23:10 UTC 2018


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 <eschwartz at archlinux.org>
---
 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() {
-- 
2.17.0


More information about the arch-projects mailing list