From nobody Thu May 16 17:31:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgHF90lwmz5Lb8m; Thu, 16 May 2024 17:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgHF90FHbz4S3y; Thu, 16 May 2024 17:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fG5Lp4fCTaOOqtHjwhR1Y153dGX589v4sDQkL5dDjAo=; b=AMwYj8wBLti9IIDOgTn266cSJNenUbZ8KfMd98jOZOB5zmJol2Ozy3PZapeyxhJl9BTJ0a PeA8IPRPH7PPKNXSmK8cngIeyF0cVQsuyWbRaAYih0pB0H2WPNhOqrrxWYgDRDa1DRnA37 HMsIBhyYXHtuhIdlR0SV9iMQA+nPOlQjrjjKk9oZxbeVK7plxTSK0hSF21SbALw+XgmyJR ZeZRvoyhLq9MUldIGrXs8OMMenWTal//pFMtzXZDqTyebGWOh7Ywoue+BNNM/R1Gb780+k 0eh7sWBkxcEXL7Khg0CtipvnKrCEibR+siUdTLnJz1DFHgPDQ/HLtbpSPVr/WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715880669; a=rsa-sha256; cv=none; b=tSAweVrJo7o6Crb54uZ8Uxe9/E6648dWtXRkbyg5EPf1RMXL/44vDGOMpfTVeyzItfsf9M D6Kpf1cnzPKg9vYsC1A0Ok9nrp6TYohTCXP+YsHbay+YJYhXOylJlFjEGF999ZuBLWNK3X D/bWBXl5GEN0WN3qJdm+QyFHmEoLfM/cdahEKod9fBtEqx7mKGey/WbzTA+UfeGL35pQiL cSFJVJgs4taza6bolEOvt6PY0fGLMBHKoe+miOBvD1QcrFXacG+dY0Smu/+ThuwtZk4wI8 thyyIrLWPHhee7LtknJr3juT2bB5uYJgIX87tSjA9sirfT3D9K21M5R5Px3tng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715880669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fG5Lp4fCTaOOqtHjwhR1Y153dGX589v4sDQkL5dDjAo=; b=i3vWhuq8IkPwD8DUCycrwzBMvcnVpxmJCP+ZCfEro7afG7ffvXffBF9Ek8uQ05vmIDuybv +4xMTljMri/SMbsG+KD8uk3aQtd+qdt3iYdfS2DcJIsm8kNwCBThikJiaHmACvQK2yts9L SRLN3ONCyyn/uemCOQxhZrXBb5bzI/2SLJDiBPUS3DcB7ILJoUZiqRBvHuIxwiIi/gdnjK ddr/I5Q5+tdJZdqYUwyO4w1v+3TaFtv4mRQwN5Ilg5HkYeMizpX/0grkk+GCFNK15iU1aQ w5AHMiu2VU9NadiWxBDjJ0dafE2iHULHae0TQJ96Np/wDwIXP3YVPfQaDhnMHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VgHF86z3kz177X; Thu, 16 May 2024 17:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GHV8MI063945; Thu, 16 May 2024 17:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GHV8Y6063942; Thu, 16 May 2024 17:31:08 GMT (envelope-from git) Date: Thu, 16 May 2024 17:31:08 GMT Message-Id: <202405161731.44GHV8Y6063942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 65fd76b5f566 - main - makeman: extend duplicate option warning to OPT_ options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65fd76b5f566a21d4e017711e8d0678aab6fe59e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=65fd76b5f566a21d4e017711e8d0678aab6fe59e commit 65fd76b5f566a21d4e017711e8d0678aab6fe59e Author: Ed Maste AuthorDate: 2024-05-13 19:05:39 +0000 Commit: Ed Maste CommitDate: 2024-05-16 17:30:37 +0000 makeman: extend duplicate option warning to OPT_ options In a local tree I accidentally had OPT_INIT_ALL defaulting to zero in userland and none in kernel. This resulted in the INIT_ALL text appearing twice in src.conf.5. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45184 --- tools/build/options/makeman | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 30416b03b983..e0980d3be607 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -379,12 +379,18 @@ EOF The following options accept a single value from a list of valid values. .Bl -tag -width indent EOF + prev_opt= show_group_options | while read opt ; do if [ ! -f ${opt} ] ; then echo "no description found for ${opt}, skipping" >&2 continue fi + if [ $opt = "$prev_opt" ]; then + echo "ignoring duplicate option $opt" >&2 + continue + fi + prev_opt=$opt echo ".It Va ${opt}" cat ${opt}