Ensure the ports directories exist for the list of

packages intended to be included on the DVD, and
remove any nonexistent ports from the final list.

Print the list of missing paths, and ensure that
DVD_PACKAGES is non-zero length (which should never
happen).

MFC after:	3 days
X-MFC-With:	r276820, r276822
Sponsored by:	The FreeBSD Foundation

1 files changed, 20 insertions, 1 deletions

diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index b1639b8..9879821 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -11,7 +11,7 @@ export PERMISSIVE="YES"
 export REPO_AUTOUPDATE="NO"
 export PKGCMD="/usr/sbin/pkg -d"
 
-DVD_PACKAGES="archivers/unzip
+_DVD_PACKAGES="archivers/unzip
 devel/subversion
 devel/subversion-static
 emulators/linux_base-f10
@@ -54,6 +54,25 @@ if [ ! -z "${PKG_ALTABI}" ]; then
 	(cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI})
 fi
 
+# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
+# final list.
+for _P in ${_DVD_PACKAGES}; do
+	if [ -d "/usr/ports/${_P}" ]; then
+		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
+	else
+		echo "*** Skipping nonexistent port: ${_P}"
+	fi
+done
+
+# Make sure the package list is not empty.
+if [ -z "${DVD_PACKAGES}" ]; then
+	echo "*** The package list is empty."
+	echo "*** Something is very wrong."
+	# Exit '0' so the rest of the build process continues
+	# so other issues (if any) can be addressed as well.
+	exit 0
+fi
+
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f