Skip to content

change secondary update order #2785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Sep 26, 2025
Merged

change secondary update order #2785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e1084
change update order
ndrsnhs Sep 25, 2025
51ea8ee
improve syntax
ndrsnhs Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions packages/helpermodules/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,16 @@ def systemUpdate(self, connection_id: str, payload: dict) -> None:
Pub().pub("openWB/system/update_in_progress", False)
return
parent_file = Path(__file__).resolve().parents[2]
if not SubData.general_data.data.extern and SubData.system_data["system"].data["secondary_auto_update"]:
for cp in SubData.cp_data.values():
# if chargepoint is external_openwb and not the second CP of duo and version is Release
if all(
cp.chargepoint.chargepoint_module.config.type == 'external_openwb',
cp.chargepoint.chargepoint_module.config.configuration.duo_num == 0,
cp.chargepoint.data.get.current_branch == "Release"
):
time.sleep(2)
self.secondaryChargepointUpdate({"data": {"chargepoint": f"cp{cp.chargepoint.num}"}})
if "branch" in payload["data"] and "tag" in payload["data"]:
pub_user_message(
payload, connection_id,
Expand All @@ -833,16 +843,6 @@ def systemUpdate(self, connection_id: str, payload: dict) -> None:
run_command([
str(parent_file / "runs" / "update_self.sh"),
SubData.system_data["system"].data["current_branch"]])
if not SubData.general_data.data.extern and SubData.system_data["system"].data["secondary_auto_update"]:
for cp in SubData.cp_data.values():
# if chargepoint is external_openwb and not the second CP of duo and version is Release
if (
cp.chargepoint.chargepoint_module.config.type == 'external_openwb' and
cp.chargepoint.chargepoint_module.config.configuration.duo_num == 0 and
cp.chargepoint.data.get.current_branch == "Release"
):
time.sleep(2)
self.secondaryChargepointUpdate({"data": {"chargepoint": f"cp{cp.chargepoint.num}"}})

def systemFetchVersions(self, connection_id: str, payload: dict) -> None:
log.info("Fetch versions requested")
Expand Down