[pacman-dev] [PATCH 1/2] 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> --- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in index 547d5fc..b8a8c30 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 } -- 2.5.3
Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in index 2dac5db..72300a4 100644 --- a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in @@ -32,7 +32,7 @@ lint_pkgbuild_functions+=('lint_changelog') lint_changelog() { - local list name file changelog_list ret=0 + local name file changelog_list changelog_list=("${changelog[@]}") for name in "${pkgname[@]}"; do -- 2.5.3
participants (1)
-
Allan McRae