From owner-svn-src-projects@FreeBSD.ORG Sun Nov 27 23:31:23 2011 Return-Path: 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 3B061106564A; Sun, 27 Nov 2011 23:31:23 +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 2AE388FC17; Sun, 27 Nov 2011 23:31:23 +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 pARNVNFW060788; Sun, 27 Nov 2011 23:31:23 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pARNVNCY060786; Sun, 27 Nov 2011 23:31:23 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201111272331.pARNVNCY060786@svn.freebsd.org> From: Mark Linimon Date: Sun, 27 Nov 2011 23:31:23 +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: r228047 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2011 23:31:23 -0000 Author: linimon (doc,ports committer) Date: Sun Nov 27 23:31:22 2011 New Revision: 228047 URL: http://svn.freebsd.org/changeset/base/228047 Log: Sigh. The last change was broken. We need to unconditionally set up the _default_ directory on the target. Modified: projects/portbuild/scripts/dosetupnode Modified: projects/portbuild/scripts/dosetupnode ============================================================================== --- projects/portbuild/scripts/dosetupnode Sun Nov 27 21:01:51 2011 (r228046) +++ projects/portbuild/scripts/dosetupnode Sun Nov 27 23:31:22 2011 (r228047) @@ -81,8 +81,9 @@ setup() { ${client_setup} pre-copy ${args} || (echo "pre-copy for ${node} failed"; return 1) if [ "${norsync}" -eq 0 ]; then + # create one master copy in the default directory rsync ${rsync_gzip} -e "${ssh_cmd}" -r -l -p --delete ${pbc}/scripts ${pbc}/sources \ - ${client_user}@${node}:${pbc}/ + ${client_user}@${node}:/var/portbuild/ checkerror $? || (echo "Copying scripts to ${node} failed"; return 1) # conf files (e.g. client.conf and common.conf) can be symlinks outside