Skip to content

K
k3s
Commit 9eb82fad authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #37920 from xuxinkun/fix-build-tools201612

Automatic merge from submit-queue (batch tested with PRs 36129, 37920) fix kube::log::error in `start_rsyncd_container`. fix kube::log::error of `start_rsyncd_container` in common.sh. Signed-off-by: 's avatarxuxinkun <xuxinkun@gmail.com>
parents f2eb14a8 29dc75ab
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
build/common.sh
View file @ 9eb82fad
...@@ -626,7 +626,7 @@ function kube::build::start_rsyncd_container() { ...@@ -626,7 +626,7 @@ function kube::build::start_rsyncd_container() {
local mapped_port local mapped_port
if ! mapped_port=$("${DOCKER[@]}" port "${KUBE_RSYNC_CONTAINER_NAME}" ${KUBE_CONTAINER_RSYNC_PORT} 2> /dev/null | cut -d: -f 2) ; then if ! mapped_port=$("${DOCKER[@]}" port "${KUBE_RSYNC_CONTAINER_NAME}" ${KUBE_CONTAINER_RSYNC_PORT} 2> /dev/null | cut -d: -f 2) ; then
kube:log:error "Could not get effective rsync port" kube::log::error "Could not get effective rsync port"
return 1 return 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment