fix exit codes on upgrade failure
This commit is contained in:
14
bin/sau
14
bin/sau
@ -8,6 +8,7 @@ import sys
|
||||
import time
|
||||
|
||||
import sau
|
||||
import sau.errors
|
||||
import sau.services
|
||||
import sau.platforms
|
||||
|
||||
@ -101,11 +102,15 @@ def main():
|
||||
reboot_required = False
|
||||
reboot_recommended = False
|
||||
|
||||
if conf.getboolean('default', 'do_system_upgrade', fallback=True):
|
||||
reboot_required = platform.system_upgrade()
|
||||
try:
|
||||
if conf.getboolean('default', 'do_system_upgrade', fallback=True):
|
||||
reboot_required = platform.system_upgrade()
|
||||
|
||||
if conf.getboolean('default', 'do_package_upgrade', fallback=True):
|
||||
reboot_required = reboot_required or platform.pkg_upgrade()
|
||||
if conf.getboolean('default', 'do_package_upgrade', fallback=True):
|
||||
reboot_required = reboot_required or platform.pkg_upgrade()
|
||||
except sau.errors.UpgradeError as e:
|
||||
log.error(f'Upgrade failed: {e}')
|
||||
return 1
|
||||
|
||||
if conf.getboolean('default', 'do_service_restart', fallback=True):
|
||||
reboot_recommended = sau.services.restart_services()
|
||||
@ -118,6 +123,7 @@ def main():
|
||||
if reboot_required or reboot_recommended:
|
||||
fork_and_reboot()
|
||||
|
||||
|
||||
def _conf_level_to_logging_level(conf_level):
|
||||
if conf_level.lower() == 'debug':
|
||||
return logging.DEBUG
|
||||
|
Reference in New Issue
Block a user