From nobody Thu May 4 16:45:59 2023 X-Original-To: dev-commits-src-branches@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 4QC07W6SPPz49J7d; Thu, 4 May 2023 16:45:59 +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 4QC07W5yMmz40bx; Thu, 4 May 2023 16:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218759; 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=P8cpJRK877nYthR9T7MLx84l3/jFWtQbTTWBr+R8Vx0=; b=u7mINTVd9qI0R9QKq4gVoFK5aXgDwIa5suxjIbOQPSXtUpeaVdXX/84llR+L5SP4klTNEh 98BIqvyckuxCbxiimKyobxtIlcMuayE6rVrNyEPbIzfkLIEi9FHbfvYc1y6VGn29gO5Fio sP9unMh8VFW5Kxcxqkvdazf0SPijrz/kYqRjv1VV4IYVaaXAKqnSLFUxt76SXp+Y41qrJY +4AZlQYr8XZ0cA9I3BDA2TLGpk1vDvppY0ww5DQj0MCVAIRJO/jVlH8UZ0LRKLpUilBW05 KoN5I6nu3J91N6V1dBZ/LAlbz5gdgldq2uixHQ99JVyL7Ei2F+tLrAVn4yIT6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218759; 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=P8cpJRK877nYthR9T7MLx84l3/jFWtQbTTWBr+R8Vx0=; b=YKvvRtTa7GoZrhZp6PGO47KmD67Xl+dOPvbKCEE0WZ1NBQElEpYW7gukgvOSbSTyx1PR+j 1gv2ybAb39KhEYn1L11A0yUlY0V/prmJumj8uBIvP835lHzKhEa2mDARgl7L9WRTAb15RC 1tF/kpF9X/Xob1PPzoOOdvVycgroKgH1W+5fdzObKzMaKO41Kq6g3vhSPbzNhF3Ukm1FcK cOzK825BzsR5YfdjAmsDP6vQJ5nEvmb7mV9P33DCYaXPtJWnceQpiEj1lHdTsxCHjQqNhY wkiFPUN2o1OT+W0kix6wHLequKKuW4DUKHs1ImUvPXCWZ5FU1rHuc0j2HrNZPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683218759; a=rsa-sha256; cv=none; b=MqjbIwMT0bw/apkJJMDcqNgZSKQ5jZAT01yu/afV9aH/3x1+IldohwpKCkATlPF16xkjw3 yLUGy/uam6ipj1yC8ukh04rrjPfWQI31qnwABwv77fMIKsPbzePYqOZC+55Nkh91KGVzgO FI5Xav3Fj5C5ykH8MJqb+N+4RySqHK8hdCLfe8RatiiqpY8i5HgqCgKnz3cRnxffmvFwvk 7HS4a4Xt/R19XTrs/YR6KBsPSwYwFLpdNRaZLZlPjSvcLU9jIr+yOsD5jzyxCh9RT+sT2k 6LAHPT2VMRgwqbbul6OTXcD9VsMbSGTlZ4TAD3pahWyXQAKf4UXq/cpFBDAqQA== 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 4QC07W51ZCzJrH; Thu, 4 May 2023 16:45:59 +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 344GjxOF068192; Thu, 4 May 2023 16:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344GjxNW068191; Thu, 4 May 2023 16:45:59 GMT (envelope-from git) Date: Thu, 4 May 2023 16:45:59 GMT Message-Id: <202305041645.344GjxNW068191@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: f6488428308e - stable/13 - pkgbase: hide duplicate METALOG directory warnings under verbose List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f6488428308edeb1fb8fc8aa0eb4e2744db78748 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6488428308edeb1fb8fc8aa0eb4e2744db78748 commit f6488428308edeb1fb8fc8aa0eb4e2744db78748 Author: Ed Maste AuthorDate: 2023-05-01 17:25:18 +0000 Commit: Ed Maste CommitDate: 2023-05-04 16:45:50 +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 (cherry picked from commit 2a3bd0870869819354b5ea65761d13e5e2987697) --- 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