git: 113f92b13ec6 - stable/12 - freebsd-update: improve mandoc db generation
Ed Maste
emaste at FreeBSD.org
Tue Apr 13 18:43:09 UTC 2021
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=113f92b13ec65a1a298630c06a680997e46a155b
commit 113f92b13ec65a1a298630c06a680997e46a155b
Author: Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-04-04 00:57:26 +0000
Commit: Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-04-13 18:42:57 +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
More information about the dev-commits-src-all
mailing list