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

added changes from current develop version

Browse source
This commit is contained in:
Max Ka 2020-02-14 19:17:52 +01:00
parent 8e6e2ba898
commit af6445c767
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap-salt.sh
View file

@ -6211,7 +6211,7 @@ __zypper() {
sleep 1
done
zypper --non-interactive "${@}";
zypper --non-interactive "${@}"
# Return codes between 100 and 104 are only informations, not errors
# https://en.opensuse.org/SDB:Zypper_manual#EXIT_CODES
if [ "$?" -gt "99" ] && [ "$?" -le "104" ]; then
@ -6229,6 +6229,8 @@ __zypper_install() {
# Option present in zypper 1.10.4 and newer:
# https://github.com/openSUSE/zypper/blob/95655728d26d6d5aef7796b675f4cc69bc0c05c0/package/zypper.changes#L253
__zypper install --auto-agree-with-licenses --replacefiles "${@}"; return $?
else
__zypper install --auto-agree-with-licenses "${@}"; return $?
fi
}