summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-09-22 16:06:29 +1000
committerAllan McRae <allan@archlinux.org>2015-09-22 16:06:29 +1000
commitdd3fe853b30069df19b8d18474c1e94a4038c369 (patch)
treeb8fcdff4bb981ade55c01ca37fec23486f093831
parent19e61a9e0726d7524b13596da1a07e50ad72d21f (diff)
downloadpacman-dd3fe853b30069df19b8d18474c1e94a4038c369.tar.xz
libmakepkg: return 1 on error in arch array
The return value was being assigned when an error was found in a PKGBUILD's arch array but it never was returned. Also remove error message explaining about adding the arch array to a PKGBUILD. That was added a long time ago when the arch array first became compulsory. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/arch.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
index 547d5fc3..b8a8c302 100644
--- a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in
@@ -47,8 +47,6 @@ lint_arch() {
if (( ! IGNOREARCH )) && ! in_array "$CARCH" "${arch[@]}"; then
error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH"
- plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
- plain "$(gettext "such as %s.")" "arch=('$CARCH')"
return 1
fi
@@ -61,4 +59,6 @@ lint_arch() {
fi
fi
done
+
+ return $ret
}