The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e04dd3b66c053422b90c387f7bbd82a0921bda0
commit 0e04dd3b66c053422b90c387f7bbd82a0921bda0 Author: Ed Maste <[email protected]> AuthorDate: 2023-05-05 17:44:39 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2023-05-10 01:10:03 +0000 pkgbase: report error if files are installed multiple times Files installed by `make installworld` should be installed only once. PR: 244596 Sponsored by: The FreeBSD Foundation --- tools/pkgbase/metalog_reader.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 9cc5fd727923..a718a1167ac7 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -401,8 +401,7 @@ function Analysis_session(metalog, verbose, w_notagdirs) 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' + errs[#errs+1] = 'error: ' .. dupmsg .. '\n' end elseif not metalogrows_all_equal(rows, false, true) then -- same filename (possibly different tags), different metadata, an error
