auto/config: alter check for unexpectedly seeded snaps in ubuntu-cpc:minimized build. As the build no longer implicitly seeds the snaps from the server seed, we can just assert no snaps are seeded. This fixes an autopkgtest regression but also cleaner.

debian/changelog

@@ -4,6 +4,10 @@ livecd-rootfs (2.840) UNRELEASED; urgency=medium
     to get their desktop packages. Previously most (all?) flavour builds got
     the snaps from that flavour's "desktop" seed implicitly added, but now an
     explicit add_task is needed.
+  * auto/config: alter check for unexpectedly seeded snaps in
+    ubuntu-cpc:minimized build. As the build no longer implicitly seeds the
+    snaps from the server seed, we can just assert no snaps are seeded. This
+    fixes an autopkgtest regression but also cleaner.
 
  -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 18 May 2023 09:25:38 +1200
 

live-build/auto/config

@@ -1170,22 +1170,15 @@ case $PROJECT:${SUBPROJECT:-} in
 esac
 
 if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-cpc:minimized ]; then
-	# We install a lxc script that installs the snap when invoked. We don't
+	# We install a lxc script that installs the snap when invoked and
-	# want any other snaps to come in without due consideration, so fail the
+	# don't want any other snaps.
-	# build if we see such a snap.
+	if [ -s config/seeded-snaps ]; then
-	for snap in `cat config/seeded-snaps`; do
+		echo "Unexpected seeded snaps for ubuntu-cpc:minimized build:"
-		case $snap in
+		cat config/seeded-snaps
-			lxd | lxd=*)
+		exit 1
-				;;
+	fi
-			*)
-				echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap"
-				exit 1
-				;;
-		esac
-	done
 
-	# Truncate but don't delete to a) prevent any snaps from being seeded,
+	# Create an empty file to trigger initialization of assertions.
-	# while at the same time b) triggering initialization of assertions.
 	truncate --size 0 config/seeded-snaps
 fi