summaryrefslogtreecommitdiff
path: root/tools/pkgbase/metalog_reader.lua
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2023-05-05 17:44:39 +0000
committerEd Maste <emaste@FreeBSD.org>2023-05-10 01:10:03 +0000
commit0e04dd3b66c053422b90c387f7bbd82a0921bda0 (patch)
treee891380b349b79343932cdf70004408429e9fc02 /tools/pkgbase/metalog_reader.lua
parentb6271cc0d0cd6e4f9592ac88b3892c3931e5f25d (diff)
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
Diffstat (limited to 'tools/pkgbase/metalog_reader.lua')
-rw-r--r--tools/pkgbase/metalog_reader.lua3
1 files changed, 1 insertions, 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