From nobody Wed Aug 24 07:14:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MCHR71rdgz4ZTKh; Wed, 24 Aug 2022 07:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MCHR712Ysz3R5j; Wed, 24 Aug 2022 07:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661325283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7KHqEsX2La8dfx/9b2PKna2TjneMRwB0pXDdxCY1Tw8=; b=fpu/7hvYQ2INwB2C2Lk2syRsO43axyVXDYGXXeL4iR0y8GosSTG8JYcL2Im3vdrdw/ymcQ YHfeOFyU2Y5sY+JbvVBzJtxHg2ieP6xDvNNWWkgB1yF/34+7zU8Ot1SHpRsxAub6yRh2nu 809UR9FTsPrNWW6SF6azzOWzGduiJpS7sxZ1BxlAQfTm0GYWdo4lZyb2OncIEIe0xii3e4 f2QZUi8pigLoftfdiiTwFxXq2Z00XwNOVyb82f22+sye3UFx/RpdDtqwvKE30Zmcf50iIo 9tdHCVrr/UYtUDUnpgvWA+Gd71XVP6fWNclDZ8ZeVQz7cagLNEbOvtf9lm1nBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MCHR674WMz10y7; Wed, 24 Aug 2022 07:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27O7EgJF037093; Wed, 24 Aug 2022 07:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27O7Egqd037092; Wed, 24 Aug 2022 07:14:42 GMT (envelope-from git) Date: Wed, 24 Aug 2022 07:14:42 GMT Message-Id: <202208240714.27O7Egqd037092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 97d54c041391 - main - MOVEDlint: ignore make.conf List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97d54c041391189df371a5858214ca1ae347caf9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661325283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7KHqEsX2La8dfx/9b2PKna2TjneMRwB0pXDdxCY1Tw8=; b=bzaHzTSIKZ3GGFbETt25X+rDMzu2v3PQS2NoNkvuwlY2C7/xjOpVh9DVFJdZwMadi6M5xh a+ugyXiQBYZl33DRg6kqHAdYukXUiFM1rSni8TlswGsTrzIben2X6UWzwIYwKMBztct5j0 6b6cVFbEboxwan+MnDhequfDx4f53rD9fdfRtd/CA15qAd5Qf6Bz7YFERhmk+WM2tjtTiB d36dAxhU7PmlICWmLOyuPGXzw837Mk9yJQbUOugoS7Q76+no8jbN3w7nfA4p506WAR83X5 GKTohrDFePaeDm289GJeuWhualUZP9YjQzTXGbOOo8BdBidoLkllzott5Zrb0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661325283; a=rsa-sha256; cv=none; b=hQjisn0nBxZGsDCQC+Sdi+m1AtoL37M2dkLGAFGcHwAx1E/e7i9SEDpbaXzjkog0l8Z9HS Q+TXrXBIg7vofcQlHK7PG50DBsUi+bChVWPStp2VJf/huy99nvjellkS2y/Zu+e8LVYCo1 gJrkFg0rvsFN+8JoaEiHQldWuRTbAX9Sk1fkt6Mlfok/Wz2uwz/WTbqOTwzlm7pXX1N+oN 5VinJvbY27m5IGDs+el3dkVUITjH0OxkWee2pFtYB06zdN4PZkQAgAenxvjSffx4yZBoBM TOWp4owaKF5Lt0GUyARFBZfUBkRM626NUvvqNkRAaOtp5gW98ZJgdsPUq2wZQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=97d54c041391189df371a5858214ca1ae347caf9 commit 97d54c041391189df371a5858214ca1ae347caf9 Author: Baptiste Daroussin AuthorDate: 2022-08-24 07:13:04 +0000 Commit: Baptiste Daroussin 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 }