git: 97d54c041391 - main - MOVEDlint: ignore make.conf

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 24 Aug 2022 07:14:42 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97d54c041391189df371a5858214ca1ae347caf9

commit 97d54c041391189df371a5858214ca1ae347caf9
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-08-24 07:13:04 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-08-24 07:14:22 +0000

    MOVEDlint: ignore make.conf
    
    Ignoring make.conf when looking up for existing flavors, makes the
    test less likely to be polluted by end user defaults, like default
    version of python etc.
---
 Tools/scripts/MOVEDlint.awk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tools/scripts/MOVEDlint.awk b/Tools/scripts/MOVEDlint.awk
index af1de6b42ca2..d589b1768989 100755
--- a/Tools/scripts/MOVEDlint.awk
+++ b/Tools/scripts/MOVEDlint.awk
@@ -123,7 +123,7 @@ $2 ~ /[ \t]/ {
         delete missing[$1]
     } else {
         if (from_flavor != "") {
-            if (!system("test \"" from_flavor "\" = \"`make -C " portsdir "/" $1 " -VFLAVORS:M" from_flavor "`\"")) {
+            if (!system("test \"" from_flavor "\" = \"`make -C " portsdir "/" $1 " -VFLAVORS:M" from_flavor " __MAKE_CONF=/dev/null`\"")) {
                 printf "%5d: %s still has the %s flavor\n", NR, $1, from_flavor | sort
             }
             # No else because the port is there but does not have the flavor,
@@ -149,7 +149,7 @@ $2 ~ /[ \t]/ {
             missing[$2] = NR
         else
             if (to_flavor != "") {
-                if (system("test \"" to_flavor "\" = \"`make -C " portsdir "/" $2 " -VFLAVORS:M" to_flavor "`\"")) {
+                if (system("test \"" to_flavor "\" = \"`make -C " portsdir "/" $2 " -VFLAVORS:M" to_flavor " __MAKE_CONF=/dev/null`\"")) {
                     printf "%5d: %s does not have the %s flavor\n", NR, $2, to_flavor | sort
                     error[NR] = 1
                 }