Merge pull request #1624 from benderl/fix-update

Fix update
openWB · May 17, 2024 · 552f083 · 552f083
2 parents f5d5a37 + 117f2bf
commit 552f083
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py
@@ -634,34 +634,33 @@ def systemUpdate(self, connection_id: str, payload: dict) -> None:
         log.info("Update requested")
         # notify system about running update, notify about end update in script
         Pub().pub("openWB/system/update_in_progress", True)
-        try:
-            if SubData.system_data["system"].data["backup_before_update"]:
+        if SubData.system_data["system"].data["backup_before_update"]:
+            try:
                 self.createCloudBackup(connection_id, {})
-        except Exception:
-            pub_user_message(payload, connection_id,
-                             ("Fehler beim Erstellen der Cloud-Sicherung."
-                              f" {traceback.format_exc()}<br />Update abgebrochen!"
-                              "Bitte Fehlerstatus überprüfen!. " +
-                              "Option Sicherung vor System Update kann unter Datenverwaltung deaktiviert werden."),
-                             MessageType.WARNING)
-            Pub().pub("openWB/system/update_in_progress", False)
-            return
-        if SubData.system_data["system"].data["update_in_progress"]:
-            parent_file = Path(__file__).resolve().parents[2]
-            if "branch" in payload["data"] and "tag" in payload["data"]:
-                pub_user_message(
-                    payload, connection_id,
-                    f'Wechsel auf Zweig \'{payload["data"]["branch"]}\' Tag \'{payload["data"]["tag"]}\' gestartet.',
-                    MessageType.SUCCESS)
-                subprocess.run([
-                    str(parent_file / "runs" / "update_self.sh"),
-                    str(payload["data"]["branch"]),
-                    str(payload["data"]["tag"])])
-            else:
-                pub_user_message(payload, connection_id, "Update gestartet.", MessageType.INFO)
-                subprocess.run([
-                    str(parent_file / "runs" / "update_self.sh"),
-                    SubData.system_data["system"].data["current_branch"]])
+            except Exception:
+                pub_user_message(payload, connection_id,
+                                 ("Fehler beim Erstellen der Cloud-Sicherung."
+                                  f" {traceback.format_exc()}<br />Update abgebrochen!"
+                                  "Bitte Fehlerstatus überprüfen!. " +
+                                  "Option Sicherung vor System Update kann unter Datenverwaltung deaktiviert werden."),
+                                 MessageType.WARNING)
+                Pub().pub("openWB/system/update_in_progress", False)
+                return
+        parent_file = Path(__file__).resolve().parents[2]
+        if "branch" in payload["data"] and "tag" in payload["data"]:
+            pub_user_message(
+                payload, connection_id,
+                f'Wechsel auf Zweig \'{payload["data"]["branch"]}\' Tag \'{payload["data"]["tag"]}\' gestartet.',
+                MessageType.SUCCESS)
+            subprocess.run([
+                str(parent_file / "runs" / "update_self.sh"),
+                str(payload["data"]["branch"]),
+                str(payload["data"]["tag"])])
+        else:
+            pub_user_message(payload, connection_id, "Update gestartet.", MessageType.INFO)
+            subprocess.run([
+                str(parent_file / "runs" / "update_self.sh"),
+                SubData.system_data["system"].data["current_branch"]])
 
     def systemFetchVersions(self, connection_id: str, payload: dict) -> None:
         log.info("Fetch versions requested")

diff --git a/runs/update_available_versions.sh b/runs/update_available_versions.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 OPENWBBASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
-LOGFILE="${OPENWBBASEDIR}/data/log/update.log"
+LOGFILE="${OPENWBBASEDIR}/ramdisk/versions.log"
 GITREMOTE="origin"
 YOURCHARGEPREFIX="yc/"