From patchwork Thu Oct 7 21:25:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: morganamilo X-Patchwork-Id: 1979 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.22) for (single-drop); Thu, 07 Oct 2021 21:26:48 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id PXn2FhhmX2FhlwMAK+/4rw (envelope-from ) for ; Thu, 07 Oct 2021 21:26:48 +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 91A6C99D5FC; Thu, 7 Oct 2021 21:26:47 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 811F08BE69D; Thu, 7 Oct 2021 21:26:47 +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 [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id ECA8A8BE68E for ; Thu, 7 Oct 2021 21:26:45 +0000 (UTC) From: morganamilo DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1633642005; 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=TVQwCWGDcr39GdOC+Aa9QDEWsExHWR5UzGCuxAS5f8Q=; b=eu4cjenkQ/wzGwwIRuk1f6itA1ulblHCHH0vK6kndJeW3QzvNZFAyIloFqMj6idMOCDPdB 51SdqEORllfJeIAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1633642005; 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=TVQwCWGDcr39GdOC+Aa9QDEWsExHWR5UzGCuxAS5f8Q=; b=rURlHZ/+15QKMsAbICaU6cr1oxTLiy26uCLk3CR97Qk6eniPU4KzGglUXFkEeeJqOodo3B c+eZ0ydowW8rlWhjvYDcWDiyeliF2CUpB6XGiLhL6lm8THtLBbnwZAAJM3p7sjvRUfq53s 9J36EpLoASwgH2UaKWPGuRdwY+sHgb1RIwkuBLVeSiaHLgxu4jq6KbITgL+v/P4UyNnuzH WiIHd3Ni9G6bxRsKNDJ5DSKEvwSNsfBxhodFCqDx5idIpXMU9gg2wvnwYhDUI/nSbcJZmz JV4Ar+whvywNtaOPvsr6EnLY9L0EJwZhVbQBqTNE9DUYGj8L7WlLDFL6dp6mUr8gbEqQ3m 4VDLlTxglF+Jazp9W2/DgNVeBeoy+1WYS8l7vDdOcBy6suEsSHTuMYqlbKkadkOr9rW0eq Z7UXtitPfDvl8gWJKMdEeSS4bZc6UhXZhG/JIPMV8XcBORRw3e3nPRrGzwwHMXWAcGhj1n +6rqZS3i8s+HaxHav6gyfVDemJFHozOSZYHbtM2+pcRgMioGoaFmFG5aVYX7jcU/hJutCS xj3Tgv0FGiIB6fZJudT14yPUMZMGftOkOBGCJ5iuejpdk6yGNcWEHAMiJeyE5N1dUcnOSP 2QTNCtkKvi3y9oVf3YCxGpsnIfb1Y4YyVmVd1gGvh2yp4D9QSiay4= To: pacman-dev@lists.archlinux.org Cc: morganamilo Subject: [PATCH] makepkg: lint empty arrays Date: Thu, 7 Oct 2021 22:25:56 +0100 Message-Id: <20211007212555.194957-1-morganamilo@archlinux.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.34 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-ed25519 header.b=eu4cjenk; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b="rURlHZ/+"; 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: 91A6C99D5FC X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; R_MISSING_CHARSET(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_IN_DNSWL_MED(-0.40)[95.216.189.61:received,95.217.236.249:from]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-ed25519,archlinux.org:s=dkim-rsa]; MAILLIST(-0.20)[mailman]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; DKIM_TRACE(0.00)[archlinux.org:+]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FROM_NEQ_ENVFROM(0.00)[morganamilo@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; NEURAL_HAM(-0.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; TO_DN_SOME(0.00)[]; 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 +}