saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor based on error output rather than return code

Browse source
This commit is contained in:
Matt McKinnon 2019-03-20 14:19:18 -04:00
parent 6f450b8971
commit 462905f137
No known key found for this signature in database
GPG key ID: 7DCCE47300DEB278
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -1818,27 +1818,27 @@ __wait_for_apt(){
WAIT_TIMEOUT=900
# Run our passed in apt command
"${@}"
APT_ERR=$(mktemp /tmp/apt_error.XXXX)
"${@}" 2>$APT_ERR
APT_RETURN=$?
# If our exit code from apt is 100, then we're waiting on a lock
while [ $APT_RETURN -eq 100 ]; do
# Make sure we're not waiting on a lock
while [ $APT_RETURN -ne 0 ] && [ $(grep -c "^E: Could not get lock" $APT_ERR) -ge 1 ]; do
echoinfo "Aware of the lock. Patiently waiting $WAIT_TIMEOUT more seconds..."
sleep 1
WAIT_TIMEOUT=$((WAIT_TIMEOUT - 1))
# If timeout reaches 0, abort.
if [ "$WAIT_TIMEOUT" -eq 0 ]; then
echoerror "Apt, apt-get, aptitude, or dpkg process is taking too long."
echoerror "Bootstrap script cannot proceed. Aborting."
return 1
else
# Try running apt again until our return code != 100
"${@}"
APT_RETURN=$?
fi
done
rm $APT_ERR
return $APT_RETURN
}