From 539c72051afb324176d86977a84c0da8a1a8b1f5 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Mon, 9 Dec 2019 16:10:20 -0800
Subject: listed_ports: Only sort with OVERLAYS.

This should help improve pipelining again when not using
OVERLAYS.
---
 src/share/poudriere/common.sh  | 10 +++++++++-
 test/bulk-flavor-ignore-all.sh |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 7b8b2520..778efec3 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -6766,7 +6766,15 @@ _listed_ports() {
 				_pget portsdir "${o}" mnt
 				_list_ports_dir "${portsdir}" "${o}"
 			done
-		} | sort -ud
+		} | {
+			# Sort but only if there's OVERLAYS to avoid
+			# needless slowdown for pipelining otherwise.
+			if [ -n "${OVERLAYS}" ]; then
+				sort -ud
+			else
+				cat -u
+			fi
+		}
 		return 0
 	fi
 
diff --git a/test/bulk-flavor-ignore-all.sh b/test/bulk-flavor-ignore-all.sh
index ec40e051..f12d7a4a 100644
--- a/test/bulk-flavor-ignore-all.sh
+++ b/test/bulk-flavor-ignore-all.sh
@@ -14,7 +14,7 @@ assert "ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-an
     "${IGNOREDPORTS-null}" "IGNOREDPORTS should match"
 
 # Assert that skipped ports are right
-assert "ports-mgmt/poudriere-devel-dep2-IGNORED ports-mgmt/poudriere-devel-dep-IGNORED" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
+assert "ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
 
 # Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
 assert_ignored "${IGNOREDPORTS}"
-- 
cgit v1.2.3