Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 May 2011 19:40:02 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r221856 - head/tools/tools/nanobsd
Message-ID:  <201105131940.p4DJe25I080655@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 	(



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105131940.p4DJe25I080655>