From owner-svn-src-head@FreeBSD.ORG  Fri May 13 19:40:02 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73FD5106566B;
	Fri, 13 May 2011 19:40:02 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E9FE8FC08;
	Fri, 13 May 2011 19:40:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4DJe27K080657;
	Fri, 13 May 2011 19:40:02 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4DJe25I080655;
	Fri, 13 May 2011 19:40:02 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201105131940.p4DJe25I080655@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 13 May 2011 19:40:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221856 - head/tools/tools/nanobsd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2011 19:40:02 -0000

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
 	(