From nobody Sun Nov 20 03:07:21 2022 X-Original-To: dev-commits-src-all@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 4NFFn60TfTz4hh59; Sun, 20 Nov 2022 03:07:22 +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 4NFFn56rKCz40xv; Sun, 20 Nov 2022 03:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668913642; 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=g0bEWxTOTGo+FTUTo2OvP3BaduEgL+M8PiHZ0Yogink=; b=sAKUKlCZJvg0S3KraLYSx0VRfs8g5+fqZpB9heB+fE7XCqKOJ3t4vNjm/6q0WRDmq76mz7 bC9n/9DCiX5iY8eLdrJK2ouoPjUMjn9jNBn6FFtuPRNiz28FzJGhiyEpU39SmTrW3xJZ2l dvc3ZDeXYGOTRZw5e7/4PYTRN8bjUvnDDmpisonWGjiJuRpmKM0deiQQZ5TJXcYIiQZwk2 xbEaY+KtywZwyOwKRiXUPhrYE07uZ30Kmaw+9fjQQfzVgaJvObgC7tgs5XXdOopEIT0tyX jv5bKDBfYCR5EcsA8adcQfopHUcQ9Z2E40kHwXxz9/yRZJAY1cFUrvdISfvZ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668913642; 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=g0bEWxTOTGo+FTUTo2OvP3BaduEgL+M8PiHZ0Yogink=; b=F5qS6ZulSOaVL5jp5GuHC6at8H4uoHHZsbDYYWayDwV5e9kM6C6P6rLzBkwEpWL2T/+Hle /2lO3XCBydPwwAm43MHDk76EySbAqVRwLq/HCVPo3tFsfdLWfkmqXPo0aDl4pb7Z9qzvKq dmyY7heH2guLw6PXD5u5UJTJdh1Oozsp6w/ooYfVzvy7EC2qCP31cFMAESMbZf4JXJnj+b R6zk+hwcw9+YbunJHfJl80Fzju2krn+GpOBsdZpjJpVOW+WguHzpoivNo6jvZ2I1MLK1w7 tFKXEXmuJkX8G8SwoKVLnl3M7KrkmJFhszhL4NeuPVwJRiySRh7i02b8EpHf3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668913642; a=rsa-sha256; cv=none; b=HCNmLFP9CD1sliBIuwtCcgFrsIHKZCvVfNeAtPX5Kcr+NOf/yUDXaKkD5Bpx/o1dTfG8eM +mp+1cpq+jtahxZaODc72qarHjfkFPPIUnPnxkEGtIs1JmGW1m1PBPKEVEJdCL4YOTBlK6 NhZ1UB0lMSgpsKtewk07JY0OV7u/u2nbCuORQWEAEKqelu62d42bS3E/yq5b2D4bJLvrGN CwuoO8oObXVg5qYGScgEWkriOvTdtGTOizH/BzMVV6hfjfAG+6tTxJuSv6Iz1WEH4cxE/d yedgw1cDrJ23V/Wy/U3tIzgiYbmkE2K9KSiKBwLAB2FivW7iiNhzyJHJvrrhkA== 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 4NFFn55x5qz18M8; Sun, 20 Nov 2022 03:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AK37LUD020486; Sun, 20 Nov 2022 03:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AK37LVb020485; Sun, 20 Nov 2022 03:07:21 GMT (envelope-from git) Date: Sun, 20 Nov 2022 03:07:21 GMT Message-Id: <202211200307.2AK37LVb020485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1b031475e734 - stable/13 - pkgbase: report type for duplicated METALOG entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b031475e734448cbd2b8bd572accbc61d999b60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b031475e734448cbd2b8bd572accbc61d999b60 commit 1b031475e734448cbd2b8bd572accbc61d999b60 Author: Ed Maste AuthorDate: 2022-11-17 14:15:20 +0000 Commit: Ed Maste CommitDate: 2022-11-19 19:12:48 +0000 pkgbase: report type for duplicated METALOG entries Duplicate METALOG file entries are more of a concern than duplicate directories. The metalog check tool previously did not include the entry type in the warnings, making it hard to find the ones of concern. Sponsored by: The FreeBSD Foundation (cherry picked from commit b751fc75bb989ea737c9f1c440d2601e1ed95092) --- tools/pkgbase/metalog_reader.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 02f8c4ab65bd..72cfcf46c95b 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -387,6 +387,7 @@ function Analysis_session(metalog, verbose, w_notagdirs) local iseq, offby = metalogrows_all_equal(rows) if iseq then -- repeated line, just a warning warn[#warn+1] = 'warning: '..filename + .. ' ' .. rows[1].attrs.type ..' repeated with same meta: line ' ..table.concat( table_map(rows, function(e) return e.linenum end), ',')