diff options
| author | Eli Schwartz via arch-projects <arch-projects@archlinux.org> | 2018-05-29 17:23:10 -0400 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-05-31 16:03:13 +0200 |
| commit | 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe (patch) | |
| tree | c9e1291fe1e686301f17bb805d6c2abca1d70f86 | |
| parent | e414173f8984485ff850e1fba0f8cf97cd970064 (diff) | |
| download | devtools32-98ff92f4675aeab379b9d5ed85e68778e1cc0dfe.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>
| -rw-r--r-- | makechrootpkg.in | 7 |
1 files changed, 7 insertions, 0 deletions
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() { |