Merge pull request #226 from plesk/release-1.2.4

Release 1.2.4
plesk · Apr 1, 2024 · f214386 · f214386
2 parents 2bc391e + 28aa976
commit f214386
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/BUCK b/BUCK
@@ -1,7 +1,7 @@
 # Copyright 1999-2024. WebPros International GmbH. All rights reserved.
 # vim:ft=python:
 
-PRODUCT_VERSION = '1.2.3'
+PRODUCT_VERSION = '1.2.4'
 
 genrule(
     name = 'version',

diff --git a/README.md b/README.md
@@ -39,8 +39,8 @@ To retrieve the latest available version of the tool, please navigate to the "Re
 
 To prepare the latest version of the tool for use from a command line, please run the following commands:
 ```shell
-> wget https://github.com/plesk/centos2alma/releases/download/v1.2.3/centos2alma-1.2.3.zip
-> unzip centos2alma-1.2.3.zip
+> wget https://github.com/plesk/centos2alma/releases/download/v1.2.4/centos2alma-1.2.4.zip
+> unzip centos2alma-1.2.4.zip
 > chmod 755 centos2alma
 ```
 

diff --git a/main.py b/main.py
@@ -323,7 +323,7 @@ def show_fail_motd() -> None:
     motd.publish_finish_ssh_login_message()
 
 
-def handle_error(error: str) -> None:
+def handle_error(options: typing.Any, error: str) -> None:
     sys.stdout.write("\n{}\n".format(error))
     sys.stdout.write(messages.FAIL_MESSAGE_HEAD.format(DEFAULT_LOG_FILE))
 
@@ -332,7 +332,14 @@ def handle_error(error: str) -> None:
         sys.stdout.write(line)
         error_message += line
 
-    sys.stdout.write(messages.FAIL_MESSAGE_TAIL.format(DEFAULT_LOG_FILE))
+    additional_message = ""
+    if Stages.convert in options.stage:
+        additional_message = "To revert the server to its original state, call 'centos2alma --revert'."
+
+    sys.stdout.write(messages.FAIL_MESSAGE_TAIL.format(
+        path_to_log=DEFAULT_LOG_FILE,
+        additional_message=additional_message
+    ))
 
     plesk.send_error_report(error_message)
     plesk.send_conversion_status(False)
@@ -352,7 +359,7 @@ def do_convert(options: typing.Any) -> None:
         flow.validate_actions()
         start_flow(flow)
         if flow.is_failed():
-            handle_error(flow.get_error())
+            handle_error(options, flow.get_error())
             return 1
 
     if not options.no_reboot and (Stages.convert in options.stage or Stages.finish in options.stage):

diff --git a/messages.py b/messages.py
@@ -32,9 +32,10 @@
 
 FAIL_MESSAGE_TAIL = """
 \033[91m**************************************************************************************
-The conversion process has failed. See the {} file for more information.
+The conversion process has failed. See the {path_to_log} file for more information.
 The last 100 lines of the file are shown above.
 For assistance, call 'centos2alma --prepare-feedback' and follow the instructions.
+{additional_message}
 **************************************************************************************\033[0m
 """