From nobody Thu Nov 17 15:37:19 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 4NCkYq6vMmz4hZ5P;
Thu, 17 Nov 2022 15:37:19 +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 4NCkYq65kdz3k3M;
Thu, 17 Nov 2022 15:37:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1668699439;
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=BLcHxbpwwmiz97hrHUfft0439fptHBpjnIis0LgzQs0=;
b=j0c9vDGYQKc+Kd2+C1iJoSqIE2Kxiq/vigUZn5wO+zIkG238jh/7mTSrhP/0gsBfFUC013
DXgW28PRl2IsBC0l2OpfMnLXDycLv841mDojadfmGOvVgdNBC4C3Ssw6y778yuqfQylNpJ
whWDcDwoEsLAi4iwkUtHFcSgS8vAe5LYidmk+uGrHopFboKgcZahGmSUWwzKnjWAb6qCvk
2u0679HsQ4173d6USZCazcLGM5e/vIznZ8Qgpco47xzVj7GrPsCzv0s9ugw1uy8C46WYaJ
RPSDuWsEahpYIHlhCvlN7Ln4+lJqpi6OM/9hux/AErlGo4xAxWVl7es6YVZmMw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1668699439;
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=BLcHxbpwwmiz97hrHUfft0439fptHBpjnIis0LgzQs0=;
b=kCs7lwzwRQpybw18uyxdzrvH6ZaTn1F/XNw4ccINCYE9mEk4K4hhkF2gumGM4kmXj6iLKf
Hqt84+9VEc9ETXHKrDryv7mq51KiyLA0MOCvfA+Lx9WxLiFpMbNWfhWr55uAUSdUr+/A+R
fgcf1Lh79NM3v7Rh/asmjBFhu40laPYhw77BYl6lEmg/6u2Kv72GJlMYWr9wy4UZ5geNbH
yMP2W3qtON+QbQyy+UBRhLws7ppZD/IYKz3apzgxF1NiMLafw01IkAq2QwiebSH1Xxijbp
IXpzTS/dF3UofcQDQNN4uVAZjMnqvUKzKVlxDiBn5bctMPu4Teq7mw4IP7cH+g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668699439; a=rsa-sha256; cv=none;
b=hG0cqyrh2+kUwocTPUC2LoQ375E1xqbRfQiPK/uoTSf5T0bm3IGykqLipPby9tuLCi0K3q
z8UHIm9l0S8m3qDI0V9PIbUM0Qhm7wIHT8x+jUaYU2qCOvqeshQrDdSleHAxeIkPJcRh01
hmramTOBEzaxIN/d29Bp7xmcq8CxBwM9bDQuZdt2kKK4xpxAK/BxyzYOD13zGZ8eiw/q4k
RkZ0jqmrrSofE/KWN3Ko6KPOeoQSRpV25fu77i3D8Q1TZuRlD4dhdtzUXij5tkBsC5Jht/
TZCW/KP37eYNc56rf5kw/yBcfYdAEvn6vjPwMli0evoA1cPZ3UyUT8KgnqPUkQ==
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 4NCkYq575mzmYh;
Thu, 17 Nov 2022 15:37:19 +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 2AHFbJG7040270;
Thu, 17 Nov 2022 15:37:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AHFbJsn040269;
Thu, 17 Nov 2022 15:37:19 GMT
(envelope-from git)
Date: Thu, 17 Nov 2022 15:37:19 GMT
Message-Id: <202211171537.2AHFbJsn040269@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: b751fc75bb98 - main - pkgbase: report type for duplicated METALOG entries
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/main
X-Git-Reftype: branch
X-Git-Commit: b751fc75bb989ea737c9f1c440d2601e1ed95092
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=b751fc75bb989ea737c9f1c440d2601e1ed95092
commit b751fc75bb989ea737c9f1c440d2601e1ed95092
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-11-17 14:15:20 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-11-17 15:28:06 +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
---
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), ',')