From patchwork Tue Jan 11 15:06:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: morganamilo X-Patchwork-Id: 2016 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.26) for (single-drop); Tue, 11 Jan 2022 15:07:03 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id mD1tDRed3WHwQQEAK+/4rw (envelope-from ) for ; Tue, 11 Jan 2022 15:07:03 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id BC930C187E5; Tue, 11 Jan 2022 15:07:01 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 78FA4BA2FD7; Tue, 11 Jan 2022 15:07:01 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [IPv6:2a01:4f9:c010:3052::1]) by lists.archlinux.org (Postfix) with ESMTPS id 6A68EBA2FCE for ; Tue, 11 Jan 2022 15:06:59 +0000 (UTC) From: morganamilo DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1641913619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9GbriF+onJuDLtn5QP9H9vCo7E5+vwdb4CDJJ6k35bE=; b=Vk0iM+ljnQE5YA4cQJX6K82mN8EUwXk9TE3w5fP7BCtgvkzOzyAk7iYZ2ZbVRaYLAMqnNI vfRIErwjffm+pJmWJoScr7YB76XWQQgVwg3isZZCDQfDs0wJkgIinyr1k2vfypl3jPsBac EY0Km6s0FqH3BbZd3bXrylcHWwAYZAwXoKxfdvQA+mMS4qcfyG9kZVq+gyKNu2RyufmoNU ls0woqME1qlVtT41Ix9AzGOy6qJym/LeD1HQoK98fGZg/YySbHohId4OYviu9Ji6UdBao3 8L3W5rRc5hP5SxGCwtF54qZeF4E4Yn1LB75rg3ZN/C1D2Lr3CwO3LF3uvIJ6cN1qjFCjrK IOvaAvw0IuVodpwcyGRaDq2N4Ob6tZoSDA4quQp8bfCcSfahz/PJVyFVSp/tVLb5fHl0Ds eJthGz4Y1uWFbVyZ1xqBI8F+KorLXVuwbL+3ddN/Krb7twpOr9JGWHmXhvGhfY468I0lMn iNKyb6SUi70/vDmRye31C/xBKvuoGKAoMrZ4Ii3XgGWxtdB8ZUPibdV33o35xDcx2Gaozl To/JlKdWhG+xK7FVsrR1bQsT68JFdS1+RZ5YRDGss3u5j5WyFUxqdUdaxF3Yz/ZiokCU3h eru1t9Ny7MJA6fkzV/dgbYJxIBtHMgG1l3bcUAR7T6q+HVy6Sqvo0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1641913619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9GbriF+onJuDLtn5QP9H9vCo7E5+vwdb4CDJJ6k35bE=; b=j6g/Jqg1mlA2t/kNSzswZNGBmkvaNVE8Cop2VNorMAygk2Jb1hcazZQl+4DpYKl+SwxkeX CTUzqJ8QCjkXXgAA== To: pacman-dev@lists.archlinux.org Cc: morganamilo Subject: [PATCH] makepkg: lint empty arrays Date: Tue, 11 Jan 2022 15:06:37 +0000 Message-Id: <20220111150637.40543-1-morganamilo@archlinux.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b=Vk0iM+lj; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b="j6g/Jqg1"; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: BC930C187E5 X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_IN_DNSWL_MED(-0.40)[2a01:4f9:c010:3052::1:received,95.217.236.249:from]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[archlinux.org:+]; FROM_HAS_DN(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[morganamilo@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org While depend arrays are already linted, many array kinds are still not. An empty string is never a valid array value so check all arrays for it. --- .../libmakepkg/lint_pkgbuild/variable.sh.in | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index b4428344..d0951258 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -28,7 +28,7 @@ source "$LIBRARY/util/pkgbuild.sh" source "$LIBRARY/util/schema.sh" lint_pkgbuild_functions+=('lint_variable') - +lint_pkgbuild_functions+=('lint_array') lint_variable() { local i a pkg out bad ret=0 @@ -95,3 +95,21 @@ lint_variable() { return $ret } + +lint_array() { + local i var ret=0 + + for i in ${pkgbuild_schema_arrays[@]}; do + local l=() + get_pkgbuild_all_split_attributes $i l + + for var in "${l[@]}"; do + if [[ -z $var ]]; then + error "$(gettext "%s does not allow empty values.")" "$i" + ret=1 + fi + done + done + + return $ret +}