pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/check check-files.mk: fix execution when CHECK_FILE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c348a1e8a1f
branches:  trunk
changeset: 389013:5c348a1e8a1f
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Nov 28 23:15:34 2022 +0000

description:
check-files.mk: fix execution when CHECK_FILES_STRICT=yes

Commit r. 1.2044 "mk: Don't define DO_NADA to true." of bsd.pkg.mk
caused the checks executed when CHECK_FILES_STRICT=yes is set to fail
(e.g., "/bin/sh: -c: line 1: syntax error near unexpected token `;'").

(The pre-existing coding style that uses "true;" rather than a bare ":"
instead has been retained, in case there is an obscure (?) reason for
that approach.)

diffstat:

 mk/check/check-files.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d100a020af60 -r 5c348a1e8a1f mk/check/check-files.mk
--- a/mk/check/check-files.mk   Mon Nov 28 21:47:49 2022 +0000
+++ b/mk/check/check-files.mk   Mon Nov 28 23:15:34 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.38 2022/11/23 11:55:43 jperkin Exp $
+# $NetBSD: check-files.mk,v 1.39 2022/11/28 23:15:34 gutteridge Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -340,7 +340,7 @@
        ${RUN}                                  \
        if ${CMP} -s ${_CHECK_FILES_PRE.sysconfdir}                     \
                     ${_CHECK_FILES_POST.sysconfdir}; then              \
-               ${DO_NADA};                                             \
+               ${TRUE};                                                \
        else                                                            \
                ${ECHO} "************************************************************"; \
                ${ECHO} "The package has modified ${PKG_SYSCONFDIR}"    \
@@ -360,7 +360,7 @@
        ${RUN}                                  \
        if ${CMP} -s ${_CHECK_FILES_PRE.varbase}                        \
                       ${_CHECK_FILES_POST.varbase}; then               \
-               ${DO_NADA};                                             \
+               ${TRUE};                                                \
        else                                                            \
                ${ECHO} "************************************************************"; \
                ${ECHO} "The package has modified ${VARBASE}"           \



Home | Main Index | Thread Index | Old Index