From nobody Mon May 01 19:28:46 2023 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 4Q9Ctl1pqVz48vjn; Mon, 1 May 2023 19:28:47 +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 4Q9Ctl1M7Xz4Mwx; Mon, 1 May 2023 19:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682969327; 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=D4OuiSfR+Ioq/kpqeQhiuNJNsa0sfFPLiKxDpPXrFUA=; b=eauecoYqd60AiepqBEYXkitgjsFrOhVQMJxPE0vnEcnr6SVd0xm4BaFNfaBiEQNUnhOvf2 alzQYYqG5atGLbRohiipupu2ljA3gNV4pKBHTCJ99U7Vze9mVlZ40p6cyJV369zGM2AhzE 43LVH3FWU7VZR5yJIMxD/plx0oAXoEIvWyRu0w4cyBtT0Q+VfG+hcBmWZxzEhS91WxVgBd ZvMqRLJoVXFy3wU+E0N8YaKMTOrpt4+rVpXiDJ5EWjqChaEQFR5whxdIXgTxXR5WYttK+p ijZUKD63+TV42NlfiEZvoouxtQpoWmSy65PhmPFry1MnSBcVloWrWh5URf4UnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682969327; 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=D4OuiSfR+Ioq/kpqeQhiuNJNsa0sfFPLiKxDpPXrFUA=; b=kYc4gVBKYjt2JJHJ3SObO23XflYS054oohsyo+ERc1yn5YxVZbQ+VtfP2PYErfPQiXO/3o N/HpN87Z82aqBtxFH2ZCH20UUX42SWptoupkygvp5lpvaTsDisZEslQkxFQyTunET0362V fzoW8XegjUQfXfwbPqSwpP6oIo8/RzQjjpN9jca0ge7wo1j/d3Av31cD9sAl6QdTsj9QC5 Zr1GRCPOHQDj2SdoG4JmTymn3cjYkjlqah4AGzqWA0/eyftcPfiJabjUQP9i8jk9K+oSFP MIWmlgd9sBQSyBFakSLcO1NYN2Xo9ts+LDXj+qnmfGRPOsxL09v9GmbRAUpO5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682969327; a=rsa-sha256; cv=none; b=FbZQPmRIXFavU6nkHI+lMZ+dN3/QG/hiPXtj1bkzFGCREX7luD+q2f4btDYWxdhCpipvKp 8ryG3st7KcxjIyVbr256K1gYNu4rTNOcYjk2M8gWLT7HciRC8Czv4fn0cbA5E8VJygoUVb FyAKrCV+kouLB0ODUjx6381qdXgp1H4Ianh8EGw9FRK7UDpj+anMZaHSUhsCbd3xiKx31p C1JR9g8a8gJfA/oM17M+AQ9D5g5Lr41qiOZzgfrzIE05uDcdZSCmNg+xsni3gRREbKivYE RE9n/3OUZr6tDbFhG9lEzrs2QMHGsWi/zVrJOmzJ5/sEWymV6zDWeaerUS5FBw== 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 4Q9Ctl0Lq8zHsc; Mon, 1 May 2023 19:28:47 +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 341JSkXM087162; Mon, 1 May 2023 19:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341JSkmO087161; Mon, 1 May 2023 19:28:46 GMT (envelope-from git) Date: Mon, 1 May 2023 19:28:46 GMT Message-Id: <202305011928.341JSkmO087161@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: 2a3bd0870869 - main - pkgbase: hide duplicate METALOG directory warnings under verbose 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2a3bd0870869819354b5ea65761d13e5e2987697 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3bd0870869819354b5ea65761d13e5e2987697 commit 2a3bd0870869819354b5ea65761d13e5e2987697 Author: Ed Maste AuthorDate: 2023-05-01 17:25:18 +0000 Commit: Ed Maste CommitDate: 2023-05-01 19:22:36 +0000 pkgbase: hide duplicate METALOG directory warnings under verbose Creating directories multiple times is an inherent side effect of the way installation is done. Hide warnings from duplicate directory entries (with identical metadata) under metalog_reader's verbose mode. Duplicate file entries are always reported. They currently generate warnings but will be switched to errors once the few instances currently in the tree are fixed. PR: 244596, 271178 Reviewed by: kevans Sponsored By: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39898 --- tools/pkgbase/metalog_reader.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 3e8cf8461914..9cc5fd727923 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -392,12 +392,18 @@ function Analysis_session(metalog, verbose, w_notagdirs) if #rows == 1 then goto continue end 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), ',') - warn[#warn+1] = '\n' + local dupmsg = filename .. ' ' .. + rows[1].attrs.type .. + ' repeated with same meta: line ' .. + table.concat(table_map(rows, function(e) return e.linenum end), ',') + if rows[1].attrs.type == "dir" then + if verbose then + warn[#warn+1] = 'warning: ' .. dupmsg .. '\n' + end + else + -- XXX downgrade to warning until instances in the tree are fixed (PR271178) + warn[#warn+1] = 'error: ' .. dupmsg .. '\n' + end elseif not metalogrows_all_equal(rows, false, true) then -- same filename (possibly different tags), different metadata, an error errs[#errs+1] = 'error: '..filename