aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinimon <linimon@FreeBSD.org>2011-01-23 10:26:14 +0800
committerlinimon <linimon@FreeBSD.org>2011-01-23 10:26:14 +0800
commit5f09b22e36fd82f600fad9a658141e1aebf68014 (patch)
tree2313228d2b8efa065e2fd410c9f49ed2c5a3d15c
parentfdf0a9365117e694278dd0af962cc536cd07e7bd (diff)
downloadfreebsd-ports-graphics-5f09b22e36fd82f600fad9a658141e1aebf68014.tar.gz
freebsd-ports-graphics-5f09b22e36fd82f600fad9a658141e1aebf68014.tar.zst
freebsd-ports-graphics-5f09b22e36fd82f600fad9a658141e1aebf68014.zip
Force the copy of portbuild.* files as files, not symlinks. Adjust
the comment for bindist-* to match. Feature safe: yes
-rwxr-xr-xTools/portbuild/scripts/dosetupnode7
1 files changed, 5 insertions, 2 deletions
diff --git a/Tools/portbuild/scripts/dosetupnode b/Tools/portbuild/scripts/dosetupnode
index 7cd14c1e6ca..f01e5cce58b 100755
--- a/Tools/portbuild/scripts/dosetupnode
+++ b/Tools/portbuild/scripts/dosetupnode
@@ -71,12 +71,15 @@ setup() {
${client_user}@${node}:${pb}/
checkerror $? || (echo "Copying scripts to ${node} failed"; return 1)
- # client.conf and common.conf can be symlinks; copy the actual files
+ # 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 ${pb}/${arch}/*.conf \
${client_user}@${node}:${pb}/${arch}
checkerror $? || (echo "copying *.conf to ${node} failed"; return 1)
- rsync ${rsync_gzip} -e "${ssh_cmd}" -r -l -p --delete ${pb}/${arch}/portbuild* \
+ # portbuild.* can be symlinks outside this dir, so copy the actual
+ # files
+ rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pb}/${arch}/portbuild* \
${client_user}@${node}:${pb}/${arch}
checkerror $? || (echo "copying portbuild* files to ${node} failed"; return 1)