Force the copy of portbuild.* files as files, not symlinks. Adjust

the comment for bindist-* to match.

Feature safe:	yes

1 files changed, 5 insertions, 2 deletions

diff --git a/Tools/portbuild/scripts/dosetupnode b/Tools/portbuild/scripts/dosetupnode
index 7cd14c1e6ca7..f01e5cce58bf 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)