From aefdd5af7560a127dd4afd599574d466d778c652 Mon Sep 17 00:00:00 2001 From: Daniel Morante Date: Sat, 24 Feb 2024 04:37:53 -0500 Subject: [PATCH] Fix bug when using branches in sources I think you need to replace spaces with "_". Otherwise Portshaker gets confused when you use Git branches in some sources, and tries to call the `merge_to` sub command like: ``` merge_to -m source branch -t /usr/local/poudriere/ports/target ``` --- portshaker.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portshaker.sh.in b/portshaker.sh.in index 1f9e767..16df059 100755 --- a/portshaker.sh.in +++ b/portshaker.sh.in @@ -208,7 +208,8 @@ if [ "${_do_merge}" -eq 1 ]; then _master="${_source}" _first=0 else - ${config_dir}/portshaker.d/${_source} -- merge_to ${_merge_flags} -m "${_master}" -t ${_target} || exit 1 + _master=`echo ${_master} | sed 's/ /_/g'` + ${config_dir}/portshaker.d/${_source} -- merge_to ${_merge_flags} -m "${_master}" -t ${_target} || exit 1 fi done