From 1e0525b1ad7f17fd292d804d2e2ef87f2b64a4ab Mon Sep 17 00:00:00 2001 From: William Wernert Date: Mon, 28 Dec 2020 13:57:44 -0500 Subject: [PATCH] [fix] Only call progress callback if arg passed --- salt/common/tools/sbin/so-common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 4909bc5e1..9382fe472 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -158,14 +158,14 @@ wait_for_apt() { local count=0 while [[ "$count" -lt "$retry_count" ]]; do if __check_apt_lock; then - if [ -z "$progress_callback" ]; then + if [[ -z $progress_callback ]]; then echo "$lock_msg" echo "$retry_msg" else $progress_callback "$retry_msg" fi else - $progress_callback "$old_text" + [[ -z $progress_callback ]] && $progress_callback "$old_text" return 0 fi sleep "$retry_timeout"