D39898.id121312.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39898.id121312.diff
View Options

	Index: tools/pkgbase/metalog_reader.lua
	===================================================================
	--- tools/pkgbase/metalog_reader.lua
	+++ tools/pkgbase/metalog_reader.lua
	@@ -392,12 +392,14 @@
	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'
	+ if verbose or rows[1].attrs.type != "dir" then
	+ 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'
	+ end
	elseif not metalogrows_all_equal(rows, false, true) then
	-- same filename (possibly different tags), different metadata, an error
	errs[#errs+1] = 'error: '..filename