From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 11 14:45:42 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A741EF46;
 Mon, 11 Feb 2013 14:45:42 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 903556A0;
 Mon, 11 Feb 2013 14:45:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BEjg4a031425;
 Mon, 11 Feb 2013 14:45:42 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BEjgGq031423;
 Mon, 11 Feb 2013 14:45:42 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302111445.r1BEjgGq031423@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 14:45:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246681 - projects/portbuild/admin/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Feb 2013 14:45:42 -0000

Author: linimon (doc,ports committer)
Date: Mon Feb 11 14:45:41 2013
New Revision: 246681
URL: http://svnweb.freebsd.org/changeset/base/246681

Log:
  Fix the test for whether the portbuild zpool exists.  While here, add
  some more armor-plating.

Modified:
  projects/portbuild/admin/tools/newmkportbuild

Modified: projects/portbuild/admin/tools/newmkportbuild
==============================================================================
--- projects/portbuild/admin/tools/newmkportbuild	Mon Feb 11 14:32:06 2013	(r246680)
+++ projects/portbuild/admin/tools/newmkportbuild	Mon Feb 11 14:45:41 2013	(r246681)
@@ -27,10 +27,19 @@ if [ -z "${PORTBUILD_USER}" ]; then
   echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}."
   exit 1
 fi
+if [ ! `id ${PORTBUILD_USER} 2> /dev/null` ]; then
+  echo "User ${PORTBUILD_USER} must exist."
+  exit 1
+fi
 if [ -z "${SRCBUILD_USER}" ]; then
   echo "You must export SRCBUILD_USER, for example, export SRCBUILD_USER=${DEFAULT_SRCBUILD_USER}."
   exit 1
 fi
+if [ ! `id ${SRCBUILD_USER} 2> /dev/null` ]; then
+  echo "User ${SRCBUILD_USER} must exist."
+  exit 1
+fi
+
 if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then
   VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}"
 fi
@@ -74,7 +83,8 @@ fi
 
 # create a place to hold all portbuild-managed files.  All other ZFS_VOLUME
 # files are managed by srcbuild.
-if [ ! -d ${ZFS_MOUNTPOINT}/portbuild ]; then
+name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/portbuild`
+if [ -z "${name}" ]; then
   echo "ZFS volume ${ZFS_VOLUME}/portbuild does not exist.  I'll create it for you."
   zfs create ${ZFS_VOLUME}/portbuild || exit 1
 fi