Date: Fri, 25 Nov 2011 12:51:32 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r227970 - projects/portbuild/scripts Message-ID: <201111251251.pAPCpWjH044029@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111251251.pAPCpWjH044029>