From af6445c76758039bbc2087cc61d69ff262641048 Mon Sep 17 00:00:00 2001 From: Max Ka Date: Fri, 14 Feb 2020 19:17:52 +0100 Subject: [PATCH] added changes from current develop version --- bootstrap-salt.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c57c54b..5eac6a1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -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 }