aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2022-08-24 07:13:04 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2022-08-24 07:14:22 +0000
commit97d54c041391189df371a5858214ca1ae347caf9 (patch)
tree125de9fb0ce0e608d17ca6fbdc1dcfebb751ee6f /Tools
parentff972341bd719b9d8e79f0422fe983a7741a283c (diff)
downloadports-97d54c041391189df371a5858214ca1ae347caf9.tar.gz
ports-97d54c041391189df371a5858214ca1ae347caf9.zip
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.
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/MOVEDlint.awk4
1 files 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
}