From nobody Wed May 10 01:10:33 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 4QGH5P3bgfz49p0m; Wed, 10 May 2023 01:10:33 +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 4QGH5P2gVqz3rZk; Wed, 10 May 2023 01:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681033; 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=MNs48xCHF+7a2OhTuAF+rimqrGKwTVTjAGCOwuk3QkM=; b=GYnYvRPaZTpqCvYuZUH1IsEQ5i9Gf4BmW4m7WSdvJvnI9YsNzBoBaXE/UmOEq4x+62t/Hx +NrudZiaO/ZHiRQmZBnNmDv74ato1PtLBjZ1nK7Inv9TQT49RfEgQlWrncNK76Pf29xTZq ONC8lksBJdztLt7FvnSYI2KqNHj4DIQklYAxrEj33jpWS3UP3QL4Nua069UR/2L67Bemrv 14M9blRLzFFni60Vzbd9a0HB0GBMaCTc4No4fWaqhZl/dZqBMIC8mnMg/IUHZ4CK38ke2k j6MyT0+LWIc5WcZNI8PDLdH06XzW/LgdLXoLYrlpJL5vM05xzdoERac1/KGZ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681033; 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=MNs48xCHF+7a2OhTuAF+rimqrGKwTVTjAGCOwuk3QkM=; b=ZTGu9fP6Txqba3LK6aFApLtwt8jLiGq5vdUD1Y6/ncId16ueuyKBJWF2ExhOX8Dr+chuHf bcXuBKGv2YBPab0tCWuo/ADwt6+j/JY0EvwzTQvveIJDu77tAJtUOp39lZm7Wcb+lIjIpX xcFjvBjmxd0VKTkjxPPb7UvKO0eUnupN5v6Oi0fADBDiGcvoTBjTdym7mrf9GLPxtgwHqJ kyXOF6Hw3Yn4khn0ULNAlyZ0V9sklzN/w8sHJ1oV/nUgf8cr50ckQwjqK/pYsWNimJgrzS YYPhbe+cP6Ys7JhQw7P7me8y6+MGjtpZhitusHZ0aGnQnuSsrZxM52ZFcxPomA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683681033; a=rsa-sha256; cv=none; b=uiUL68sEyX8n8/L44Z2n4Nri3qQvja4iDFrUtSR49/2w484iFEi0Z6+OALnG+nb9Fd+QKv POPm81OqxKxMVhWFVwhfQZn6NaJn+/fuzvgzXFYMi0jpBCOO8cMPE+eVcUtZESMY8DEjaI zzIRhbY5xS5lMJSNSUE5AVy8qaDwu8KI0HMGM6Dm7+9i88Ttt+MewNHsCmTWBjgJGABAxP 8ODbVcluk1A8vTr595dBM2qronge51k4xfFi5jauP2qfMmeBITgvBO4Yi3PrQw7dm7y4pp tcxkU/wMrRYBUvQMVwamHuBFuCl26WOksA7Y5oFPzE0zfsa4ruins0SPeQByeA== 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 4QGH5P0dlgzqYq; Wed, 10 May 2023 01:10:33 +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 34A1AXYu078870; Wed, 10 May 2023 01:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A1AXpw078869; Wed, 10 May 2023 01:10:33 GMT (envelope-from git) Date: Wed, 10 May 2023 01:10:33 GMT Message-Id: <202305100110.34A1AXpw078869@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: 0e04dd3b66c0 - main - pkgbase: report error if files are installed multiple times 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: 0e04dd3b66c053422b90c387f7bbd82a0921bda0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e04dd3b66c053422b90c387f7bbd82a0921bda0 commit 0e04dd3b66c053422b90c387f7bbd82a0921bda0 Author: Ed Maste AuthorDate: 2023-05-05 17:44:39 +0000 Commit: Ed Maste 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