svn commit: r221856 - head/tools/tools/nanobsd

Warner Losh imp at FreeBSD.org
Fri May 13 19:40:02 UTC 2011


Author: imp
Date: Fri May 13 19:40:02 2011
New Revision: 221856
URL: http://svn.freebsd.org/changeset/base/221856

Log:
  If there's no package directory, don't try to install packages from
  it.  Instead, report that 0 packages are reported.
  
  PR:		misc/140436

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Fri May 13 19:35:01 2011	(r221855)
+++ head/tools/tools/nanobsd/nanobsd.sh	Fri May 13 19:40:02 2011	(r221856)
@@ -684,6 +684,12 @@ cust_install_files () (
 
 cust_pkg () (
 
+	# If the package directory doesn't exist, we're done.
+	if [ ! -d ${NANO_PACKAGE_DIR} ]; then
+		echo "DONE 0 packages"
+		return 0
+	fi
+
 	# Copy packages into chroot
 	mkdir -p ${NANO_WORLDDIR}/Pkg
 	(


More information about the svn-src-head mailing list