Jerry/pacroller
1
0
Fork 0
mirror of https://github.com/isjerryxiao/pacroller.git synced 2024-09-20 10:32:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

oops, wrong if

Browse source
This commit is contained in:
JerryXiao 2021-01-18 15:35:59 +08:00
parent 7c67531f48
commit 008d4817f8
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/pacroller/main.py
View file

@ -215,39 +215,39 @@ def main() -> None:
exit(1) exit(1)
if prev_err := has_previous_error(): if prev_err := has_previous_error():
logger.error(f'Cannot continue, a previous error {prev_err} is still present. Please resolve this issue and run fail-reset.') logger.error(f'Cannot continue, a previous error {prev_err} is still present. Please resolve this issue and run fail-reset.')
exit(2)
if SYSTEMD: if SYSTEMD:
if _s := is_system_failed(): if _s := is_system_failed():
logger.error(f'systemd is in {_s} state, refused') logger.error(f'systemd is in {_s} state, refused')
exit(11) exit(11)
try:
report = do_system_upgrade(args.debug)
except NonFatal:
raise
except Exception as e:
write_db(None, e)
raise
else: else:
try: exc = CheckFailed('manual inspection required') if report.failed else None
report = do_system_upgrade(args.debug) write_db(report, exc)
except NonFatal: if exc:
raise exit(2)
except Exception as e: if NEEDRESTART:
write_db(None, e) try:
raise p = subprocess.run(
else: NEEDRESTART_CMD,
exc = CheckFailed('manual inspection required') if report.failed else None stdin=subprocess.DEVNULL,
write_db(report, exc) stdout=subprocess.PIPE,
if exc: stderr=subprocess.STDOUT,
encoding='utf-8',
timeout=TIMEOUT
)
except subprocess.CalledProcessError as e:
logger.error(f'needrestart failed with {e.returncode=} {e.output=}')
write_db(None, NeedrestartFailed(f'{e.returncode=}'))
exit(2) exit(2)
if NEEDRESTART: else:
try: logger.debug(f'needrestart {p.stdout=}')
p = subprocess.run(
NEEDRESTART_CMD,
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
encoding='utf-8',
timeout=TIMEOUT
)
except subprocess.CalledProcessError as e:
logger.error(f'needrestart failed with {e.returncode=} {e.output=}')
write_db(None, NeedrestartFailed(f'{e.returncode=}'))
exit(2)
else:
logger.debug(f'needrestart {p.stdout=}')
elif args.action == 'status': elif args.action == 'status':
count = 0 count = 0