CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 02:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Message formatting

Browse Source
This commit is contained in:
William Wernert
2020-12-28 14:06:33 -05:00
parent 17160dcdbe
commit f7a60a011b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/common/tools/sbin/so-common
View File

@@ -157,10 +157,12 @@ wait_for_apt() {
fi fi
local count=0 local count=0
while [[ "$count" -lt "$retry_count" ]]; do while [[ "$count" -lt "$retry_count" ]]; do
((count++))
echo "Attempting to acquire dpkg lock... (Attempt $count/$retry_count)"
if __check_apt_lock; then if __check_apt_lock; then
if [[ -z $progress_callback ]]; then if [[ -z $progress_callback ]]; then
echo "$lock_msg" echo " $lock_msg"
echo "$retry_msg" echo " $retry_msg"
else else
$progress_callback "$retry_msg" $progress_callback "$retry_msg"
fi fi
@@ -169,7 +171,6 @@ wait_for_apt() {
return 0 return 0
fi fi
sleep "$retry_timeout" sleep "$retry_timeout"
((count++))
done done
if __check_apt_lock; then if __check_apt_lock; then