From 79600e3a204a58c15ccd8a465a783d2f5b83f508 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Wed, 4 Mar 2020 06:08:32 +0000 Subject: [PATCH 1/2] Fix order of assignments so we set path as intended, not to empty. --- pkgtools/pbulk/files/pbulk/scripts/client-prepare | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgtools/pbulk/files/pbulk/scripts/client-prepare b/pkgtools/pbulk/files/pbulk/scripts/client-prepare index 3123969969d..a8b8d964b74 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/client-prepare +++ b/pkgtools/pbulk/files/pbulk/scripts/client-prepare @@ -27,11 +27,11 @@ for client in ${scan_clients} ${build_clients}; do done for client in ${unique_clients}; do - case ${client} in + case ${client} in /*) + path=${client} port= client= - path=${client} ;; *:*) port="-p ${client##*:}" From 73446d8a983b8192ee13049d896f413f860ced1b Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Wed, 4 Mar 2020 16:30:48 +0000 Subject: [PATCH 2/2] Fix typo: $client_prepare_chroot, not clients_prepare_chroot. --- pkgtools/pbulk/files/pbulk/scripts/client-prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgtools/pbulk/files/pbulk/scripts/client-prepare b/pkgtools/pbulk/files/pbulk/scripts/client-prepare index a8b8d964b74..0226c44bd1b 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/client-prepare +++ b/pkgtools/pbulk/files/pbulk/scripts/client-prepare @@ -46,7 +46,7 @@ for client in ${unique_clients}; do if [ -z "$path" ]; then ssh $port $client "${client_prepare_action}" & else - clients_prepare_chroot "$path" & + $client_prepare_chroot "$path" & fi done