From 9561ea00e26a3fe98ce43ee778f932d5ad907b49 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Mon, 25 Oct 2021 18:59:49 -0700
Subject: download_from_repo: Never fetch packages if remote pkg is newer than
 ports

---
 src/share/poudriere/common.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 120fa45b..02eb6650 100644
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -3667,19 +3667,16 @@ download_from_repo() {
 	    PACKAGESITE="${packagesite}" \
 	    ${pkg_bin} update -f
 
-	# Make sure the bootstrapped pkg is not newer.
-	if [ "${pkg_bin}" = "pkg" ]; then
-		local_pkg_name="${P_PKG_PKGNAME:?}"
-		local_pkg_ver="${local_pkg_name##*-}"
-		remote_pkg_ver=$(injail ${pkg_bin} rquery -U %v \
-		    ${P_PKG_PKGBASE:?})
-		if [ "$(pkg_version -t "${remote_pkg_ver}" \
-		    "${local_pkg_ver}")" = ">" ]; then
-			msg "Package fetch: Not fetching due to remote pkg being newer than local: ${remote_pkg_ver} vs ${local_pkg_ver}"
-			rm -f "${missing_pkgs}"
-			return 0
-		fi
+	remote_pkg_ver=$(injail ${pkg_bin} rquery -U %v ${P_PKG_PKGBASE:?})
+	local_pkg_name="${P_PKG_PKGNAME:?}"
+	local_pkg_ver="${local_pkg_name##*-}"
+	if [ "$(pkg_version -t "${remote_pkg_ver}" \
+	    "${local_pkg_ver}")" = ">" ]; then
+		msg "Package fetch: Not fetching due to remote pkg being newer than local: ${remote_pkg_ver} vs ${local_pkg_ver}"
+		rm -f "${missing_pkgs}"
+		return 0
 	fi
+
 	# pkg insists on creating a local.sqlite even if we won't use it
 	# (like pkg rquery -U), and it uses various locking that isn't needed
 	# here. Grab all the options for comparison.
-- 
cgit v1.2.3