From owner-svn-src-projects@FreeBSD.ORG  Mon Jul 18 01:01:44 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 8F3351065673;
	Mon, 18 Jul 2011 01:01:44 +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 7E9648FC14;
	Mon, 18 Jul 2011 01:01:44 +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 p6I11i7O098435;
	Mon, 18 Jul 2011 01:01:44 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6I11i2v098433;
	Mon, 18 Jul 2011 01:01:44 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201107180101.p6I11i2v098433@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 18 Jul 2011 01:01:44 +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: r224163 - 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:01:44 -0000

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

Log:
  Also clean up /tmp/${buildid}/ when done.

Modified:
  projects/portbuild/scripts/dosetupnode

Modified: projects/portbuild/scripts/dosetupnode
==============================================================================
--- projects/portbuild/scripts/dosetupnode	Mon Jul 18 00:49:35 2011	(r224162)
+++ projects/portbuild/scripts/dosetupnode	Mon Jul 18 01:01:44 2011	(r224163)
@@ -137,8 +137,9 @@ setup() {
 	done
     fi
 
+    ${ssh_cmd} ${client_user}@${node} ${sudo_cmd} rm -rf ${cmdpath}
     if [ "${full}" -eq 1 ]; then
-	${ssh_cmd} ${client_user}@${node} ${sudo_cmd} rm -rf ${pbd}/${arch}/${branch}/builds/${buildid}/.ready ${pbd}/${arch}/${branch}/builds/${buildid} /tmp/.setup-${buildid}
+	${ssh_cmd} ${client_user}@${node} ${sudo_cmd} rm -rf ${pbd}/${arch}/${branch}/builds/${buildid}/.ready ${pbd}/${arch}/${branch}/builds/${buildid} /tmp/.setup-${buildid} /tmp/${buildid}/
     fi
 
     echo "setting up of $node ended at $(date)"
@@ -208,6 +209,7 @@ if [ "${nodelist}" = "all" ]; then
 fi
 
 for node in ${nodelist}; do
+    # XXX MCL return value not being checked, as always
     setup ${node} &
 done
 wait