From owner-dev-commits-src-branches@freebsd.org Tue Apr 13 18:42:36 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EA6C05E7A47; Tue, 13 Apr 2021 18:42:36 +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 4FKZGh5rckz3F4L; Tue, 13 Apr 2021 18:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BB9CF7E0F; Tue, 13 Apr 2021 18:42:36 +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 13DIga0P057665; Tue, 13 Apr 2021 18:42:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13DIga4l057664; Tue, 13 Apr 2021 18:42:36 GMT (envelope-from git) Date: Tue, 13 Apr 2021 18:42:36 GMT Message-Id: <202104131842.13DIga4l057664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 81a1e3f1f755 - stable/13 - freebsd-update: improve mandoc db generation 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 81a1e3f1f755aea5c3c09f2ad65c420fea97552f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 18:42:37 -0000 The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=81a1e3f1f755aea5c3c09f2ad65c420fea97552f commit 81a1e3f1f755aea5c3c09f2ad65c420fea97552f Author: Ed Maste AuthorDate: 2021-04-04 00:57:26 +0000 Commit: Ed Maste CommitDate: 2021-04-13 18:42:17 +0000 freebsd-update: improve mandoc db generation freebsd-update compares the dates on man pages with mandoc.db, and if any newer pages are found it regenerates mandoc.db. Previously, if mandoc.db did not already exist the check failed and freebsd-update then failed to create one. Now, check that mandoc.db exists before performing the check for newer pages. Reported by: bdrewery (in D10482) Reviewed by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29575 (cherry picked from commit 741223a65cd1752360c44341b762295f633e21cf) --- usr.sbin/freebsd-update/freebsd-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 004515bb8bf8..7f9b06f0221f 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2958,7 +2958,8 @@ Kernel updates have been installed. Please reboot and run if [ ! -d ${BASEDIR}/$D ]; then continue fi - if [ -z "$(find ${BASEDIR}/$D -type f -newer ${BASEDIR}/$D/mandoc.db)" ]; then + if [ -f ${BASEDIR}/$D/mandoc.db ] && \ + [ -z "$(find ${BASEDIR}/$D -type f -newer ${BASEDIR}/$D/mandoc.db)" ]; then continue; fi makewhatis ${BASEDIR}/$D