pkgsrc-Changes archive

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

CVS commit: pkgsrc/mk/check



Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Nov 28 23:15:34 UTC 2022

Modified Files:
        pkgsrc/mk/check: check-files.mk

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mk/check/check-files.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/check/check-files.mk
diff -u pkgsrc/mk/check/check-files.mk:1.38 pkgsrc/mk/check/check-files.mk:1.39
--- pkgsrc/mk/check/check-files.mk:1.38 Wed Nov 23 11:55:43 2022
+++ pkgsrc/mk/check/check-files.mk      Mon Nov 28 23:15:34 2022
@@ -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 @@ ${_CHECK_FILES_ERRMSG.sysconfdir}:                                  \
        ${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 @@ ${_CHECK_FILES_ERRMSG.varbase}:                                             \
        ${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