diff options
| author | Eli Schwartz via arch-projects <arch-projects@archlinux.org> | 2018-05-29 17:23:10 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-03 12:27:55 -0400 |
| commit | b4c286862a202e1b92aa9382b7e986d7511373ad (patch) | |
| tree | b38f7fb8151df473389f97de71c8d2b0f070b46d | |
| parent | b1773440be67eb9a5ac157c64d2d357bb1163f53 (diff) | |
| download | devtools32-b4c286862a202e1b92aa9382b7e986d7511373ad.tar.xz | |
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 <eschwartz@archlinux.org>
(cherry picked from commit 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe)
| -rw-r--r-- | makechrootpkg.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 183e688..0b4184b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -254,6 +254,13 @@ _chrootbuild() { # https://bugzilla.sudo.ws/show_bug.cgi?id=765 sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; SRCEXT="${1}" makepkg "${@:2}" --allsource' -bash "$srcext" "$@" || return 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() { |