From owner-svn-src-projects@FreeBSD.ORG  Mon Jul 18 01:04:19 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE768106564A;
	Mon, 18 Jul 2011 01:04:19 +0000 (UTC)
	(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BD6F58FC0C;
	Mon, 18 Jul 2011 01:04:19 +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 p6I14JXp098580;
	Mon, 18 Jul 2011 01:04:19 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6I14JQQ098578;
	Mon, 18 Jul 2011 01:04:19 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201107180104.p6I14JQQ098578@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 18 Jul 2011 01:04:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224165 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 18 Jul 2011 01:04:19 -0000

Author: linimon (doc,ports committer)
Date: Mon Jul 18 01:04:19 2011
New Revision: 224165
URL: http://svn.freebsd.org/changeset/base/224165

Log:
  Modernize the check for "enough disk space in /tmp".  This seems to cut
  down on the "truncated dependent packages" problem.

Modified:
  projects/portbuild/scripts/claim-chroot

Modified: projects/portbuild/scripts/claim-chroot
==============================================================================
--- projects/portbuild/scripts/claim-chroot	Mon Jul 18 01:02:44 2011	(r224164)
+++ projects/portbuild/scripts/claim-chroot	Mon Jul 18 01:04:19 2011	(r224165)
@@ -93,15 +93,28 @@ if [ ! -z "${squid_dir}" ]; then
     fi
 fi
 
-# Check for enough disk space
-df=$(df -k ${scratchdir} | tail -1 | awk '{print $4}')
-
-if [ ${df} -lt 102400 ]; then
-    touch ${scratchdir}/.disk
-    echo "error disk"
-    exit 1
+# Check for enough disk space, in gigabytes.  hack xxxm to 1g.
+if [ "${use_md_swap}" = "1" ]; then
+    used=$(swapinfo -g | tail -1 | awk '{print $4}')
+    needed=`echo ${md_size} | sed -e "s/.*m/1/;s/g//"`
+    if [ ${used} -lt ${needed} ]; then
+	touch ${scratchdir}/.swap
+	echo "error swap"
+	exit 1
+    else
+	rm -f ${scratchdir}/.swap
+    fi
 else
-    rm -f ${scratchdir}/.disk
+    used=$(df -g ${scratchdir} | tail -1 | awk '{print $4}')
+    # XXX MCL FIX HARDCODING!
+    needed="8"
+    if [ ${used} -lt ${needed} ]; then
+	touch ${scratchdir}/.disk
+	echo "error disk"
+	exit 1
+    else
+	rm -f ${scratchdir}/.disk
+    fi
 fi
 
 found=0