From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 25 12:51:32 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 EB899106564A;
	Fri, 25 Nov 2011 12:51:32 +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 DB0BB8FC14;
	Fri, 25 Nov 2011 12:51:32 +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 pAPCpWC1044031;
	Fri, 25 Nov 2011 12:51:32 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAPCpWjH044029;
	Fri, 25 Nov 2011 12:51:32 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201111251251.pAPCpWjH044029@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 25 Nov 2011 12:51:32 +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: r227970 - 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: Fri, 25 Nov 2011 12:51:33 -0000

Author: linimon (doc,ports committer)
Date: Fri Nov 25 12:51:32 2011
New Revision: 227970
URL: http://svn.freebsd.org/changeset/base/227970

Log:
  Restore the copying of /var/portbuild/scripts for now.  There are some
  places where the local override does not seem to be working correctly.
  
  While here, make some messages more consistent.

Modified:
  projects/portbuild/scripts/dosetupnode

Modified: projects/portbuild/scripts/dosetupnode
==============================================================================
--- projects/portbuild/scripts/dosetupnode	Fri Nov 25 12:43:34 2011	(r227969)
+++ projects/portbuild/scripts/dosetupnode	Fri Nov 25 12:51:32 2011	(r227970)
@@ -81,18 +81,22 @@ setup() {
     ${client_setup} pre-copy ${args} || (echo "pre-copy for ${node} failed"; return 1)
 
     if [ "${norsync}" -eq 0 ]; then
+	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -l -p --delete ${pbc}/scripts ${pbc}/sources \
+	    ${client_user}@${node}:${pbc}/
+	checkerror $? || (echo "Copying scripts to ${node} failed"; return 1)
+
 	# conf files (e.g. client.conf and common.conf) can be symlinks outside
 	# this dir, so copy the actual files
 	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pbd}/${arch}/*.conf \
 	    ${client_user}@${node}:${pbd}/${arch}
-	checkerror $? || (echo "copying *.conf to ${node} failed"; return 1)
+	checkerror $? || (echo "Copying *.conf to ${node} failed"; return 1)
 
 	# portbuild.* can be symlinks outside this dir, so copy the actual
 	# files
 	# XXX MCL really, only have to do portbuild.conf and portbuild.<nodename>.conf
 	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pbd}/${arch}/portbuild* \
 	    ${client_user}@${node}:${pbd}/${arch}
-	checkerror $? || (echo "copying portbuild* files to ${node} failed"; return 1)
+	checkerror $? || (echo "Copying portbuild* files to ${node} failed"; return 1)
 
 	if [ -f "${pbd}/${arch}/clients/bindist-${node}.tar" ]; then
 	    rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete \