From nobody Fri Nov 25 14:14:33 2022 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 4NJcLd4Yx1z4hwt9; Fri, 25 Nov 2022 14:14: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 4NJcLd41Hcz3vlG; Fri, 25 Nov 2022 14:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669385673; 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=BMNhDpS6nC+0SF6s3083SQabxOX5zOCmwOZBl0rYw7A=; b=IGHa4ZRWk9CESwta8/sJCvQguyiaekvF8+BB3qralqvga3lCl5zN4pex7NDU6YXx7IBE/a UFggRKIeoqh4dsWkh08m2p5TZi8FRXT57IjGOByR+DJKerOLYVoIu3hMHiyaMNFWVYQJDs 5h6HXAan5mek1hEQkCwsf1yEgEG1wZEff6ZQjS8XON1gJhFggEog8x6L1WWjqPZHHATifT WLRo/C85m0XpfqTPK4q4PGtzv2Fg3TyuxFuazf72kXcYrrqRl3nPx7wwob0mzVR0osCWQF 4URr/qG9OfFAJ9MwKCQByydNecS2vey9P4hhKlCMV9ZrBa30RyIute9dqVGJuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669385673; 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=BMNhDpS6nC+0SF6s3083SQabxOX5zOCmwOZBl0rYw7A=; b=TqTUGrYUpyyDRcKiGWnxzH612KLR98Ywq8glbiZs67Ck3zbfT48Ze5J6FO94IQLJPcldS9 iubjFpsLzAIiHQwDeAvGEqDcr19ulB2kcUDpFKFzPsB8JMJ5mVWcKlP4LqcqWU9WboD5Ie RwPTs5OxEsS7K9+bx9lcsijTB3D3XdbRdGZuyIrhqEdWpWXmRq5TnEboOfEpCUzIEwjRGU Vh4ocHK0drnXRzJtV1/CN6WkgVkQYUNlKDvK+2YNBmWZyjl8E3JKBD4NJEXfIhCyNDig3/ YtYdnTc7N1Ji0ZUhP58CdUOxeEOnVPaHF5rRhmZA2iN9fEmjmFz+gSrDYzDPEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669385673; a=rsa-sha256; cv=none; b=jIvZCA9l74iCJQO//W6rqVApLo9t2AjuiNtwuUSzfPDFFQHoW81g1+DX75Qzm929ZUH2Fm nH7Z1ndE2z5yV6DyZu+99OyrlA54tLI/zmvxi5BYlyVPLlpSW3FM11PPYfEU9AMG2IqE9O iqcmk44kXGPLl1OsKtssj0HWJy1bRyfSJN93QcWbj0Qi5qcn3sW7hkBw04R+G+X6nIuWsf dWhsrD+l8a2zC6VqFKJjU4zmKo6OYOeG+1coEplMehlEmpzlYoS9UQLQ1T6d0TatnT7+6l sE2jnNWu5t+4ehZIQpajSW7xUCYnqpkDscfbRRo+Igu9vMl4Ou3DX+MnpLySXw== 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 4NJcLd32hhzk8Y; Fri, 25 Nov 2022 14:14: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 2APEEXtS083611; Fri, 25 Nov 2022 14:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2APEEXM3083610; Fri, 25 Nov 2022 14:14:33 GMT (envelope-from git) Date: Fri, 25 Nov 2022 14:14:33 GMT Message-Id: <202211251414.2APEEXM3083610@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: f93d92f43d98 - main - pkgbase: report errors via metalog reader exit status 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: f93d92f43d984c1d927c7c12d06ae1497d12deea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f93d92f43d984c1d927c7c12d06ae1497d12deea commit f93d92f43d984c1d927c7c12d06ae1497d12deea Author: Ed Maste AuthorDate: 2022-11-23 21:40:22 +0000 Commit: Ed Maste CommitDate: 2022-11-25 14:13:31 +0000 pkgbase: report errors via metalog reader exit status Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37482 --- tools/pkgbase/metalog_reader.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 72cfcf46c95b..3e8cf8461914 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -86,13 +86,14 @@ function main(args) local sess = Analysis_session(filename, verbose, w_notagdirs) + local errors if printall then io.write('--- PACKAGE REPORTS ---\n') io.write(sess.pkg_report_full()) io.write('--- LINTING REPORTS ---\n') - print_lints(sess) + errors = print_lints(sess) elseif checkonly then - print_lints(sess) + errors = print_lints(sess) elseif pkgonly then io.write(sess.pkg_report_simple(dcount, dsize, { fuid and sess.pkg_issetuid or nil, @@ -103,6 +104,10 @@ function main(args) io.stderr:write('This text should not be displayed.') usage() end + + if errors then + return 1 + end end --- @param man boolean @@ -151,6 +156,7 @@ function print_lints(sess) local inodewarn, inodeerr = sess.inode_report() io.write(inodewarn) io.write(inodeerr) + return #duperr > 0 or #inodeerr > 0 end --- @param t table @@ -520,4 +526,4 @@ function Analysis_session(metalog, verbose, w_notagdirs) } end -main(arg) +os.exit(main(arg))