From ee55ccad926e62e21ad2a1c3313b847b016d56db Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Thu, 26 Sep 2024 11:45:48 +0300 Subject: [PATCH 1/2] Add information about interrupted conversion/dist-upgrade to stdout and motd --- pleskdistup/main.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pleskdistup/main.py b/pleskdistup/main.py index 348ac64..621c08f 100644 --- a/pleskdistup/main.py +++ b/pleskdistup/main.py @@ -321,6 +321,14 @@ def try_lock(lock_file: PathType) -> typing.Generator[bool, None, None]: def exit_signal_handler(signum, frame): # exit will trigger blocks finalization, so lockfile will be removed log.info(f"Received signal {signum}, going to exit...") + print(f"The dist-upgrade process was stopped by signal {signum}. Please use the `--revert` option before trying again.") + + motd.add_finish_ssh_login_message(""" +The dist-upgrade process was stopped by signal. +Please use the `--revert` option before trying again. +""") + motd.publish_finish_ssh_login_message() + sys.exit(1) From d23abc713e21c4ae8edde8146f57c13f9037f5fd Mon Sep 17 00:00:00 2001 From: Mikhail Sandakov Date: Thu, 26 Sep 2024 11:45:52 +0300 Subject: [PATCH 2/2] Fix grub.py to make flake8 happy --- pleskdistup/actions/grub.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pleskdistup/actions/grub.py b/pleskdistup/actions/grub.py index 3383022..25cf4c1 100644 --- a/pleskdistup/actions/grub.py +++ b/pleskdistup/actions/grub.py @@ -5,6 +5,7 @@ DEBCONF_CMD = "/usr/bin/debconf-show" + class AssertGrubInstallDeviceExists(action.CheckAction): def __init__(self) -> None: self.name = "check GRUB installation device exists"