From 22d98c5b186ba81f030facfc7a800e20868c8438 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 25 Dec 2024 14:00:51 -0800 Subject: [PATCH] system management: correctly show channel the user is on This would incorrectly show 'origin/' if the user was on one of the defined channels. Signed-off-by: Dirk Hohndel --- release-notes.md | 1 + .../adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 6fbdd58d..de67dda6 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,4 +1,5 @@ Changes since v2.2.4 include: +- system management page: don't offer an incorrect / non-existent 'origin/' channel for updates - feeder homepage: small changes to declutter the page - dietpi: new images support using ethernet with wifi configured (still needs reboot for ethernet to activate) - statistics: send old version to adsb.im after update diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py index 859f00aa..f471c0c9 100644 --- a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py +++ b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py @@ -1275,7 +1275,7 @@ def extract_channel(self) -> str: channel = match.group(1) if channel in ["stable", "beta", "main"]: channel = "" - if not channel.startswith("origin/"): + if channel and not channel.startswith("origin/"): channel = f"origin/{channel}" return channel