From c89f9a5e71c2e8d4cc729977a77e0a7c6d044cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20Pro=C3=9F?= Date: Sat, 8 Mar 2025 19:29:54 +0100 Subject: [PATCH 1/3] fix #17800 recression of #17310 --- source/updateCheck.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/updateCheck.py b/source/updateCheck.py index 103797f7881..aab88d1f391 100644 --- a/source/updateCheck.py +++ b/source/updateCheck.py @@ -253,6 +253,9 @@ def checkForUpdate(auto: bool = False) -> UpdateInfo | None: data = res.read().decode("utf-8") # Ensure the response is decoded correctly try: + # if data is empty, we return None, because the server returns an empty response if there is no update. + if not data: + return None parsed_response = UpdateInfo.parseUpdateCheckResponse(data) except ValueError: raise RuntimeError( From ef4ac2cd0540eb62731005bace5e2251451ae27b Mon Sep 17 00:00:00 2001 From: Sascha Cowley <16543535+SaschaCowley@users.noreply.github.com> Date: Tue, 11 Mar 2025 13:38:35 +1100 Subject: [PATCH 2/3] Update source/updateCheck.py Co-authored-by: Leonard de Ruijter <3049216+LeonarddeR@users.noreply.github.com> --- source/updateCheck.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/updateCheck.py b/source/updateCheck.py index aab88d1f391..19a24db7773 100644 --- a/source/updateCheck.py +++ b/source/updateCheck.py @@ -252,10 +252,10 @@ def checkForUpdate(auto: bool = False) -> UpdateInfo | None: raise RuntimeError(f"Checking for update failed with HTTP status code {res.code}.") data = res.read().decode("utf-8") # Ensure the response is decoded correctly + # if data is empty, we return None, because the server returns an empty response if there is no update. + if not data: + return None try: - # if data is empty, we return None, because the server returns an empty response if there is no update. - if not data: - return None parsed_response = UpdateInfo.parseUpdateCheckResponse(data) except ValueError: raise RuntimeError( From 313c99bcf7d945d2c51dd463b6c5674e10ee9fd9 Mon Sep 17 00:00:00 2001 From: Sascha Cowley <16543535+SaschaCowley@users.noreply.github.com> Date: Tue, 11 Mar 2025 13:42:37 +1100 Subject: [PATCH 3/3] Update changes --- user_docs/en/changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md index 315eae2e4cf..a2fff994402 100644 --- a/user_docs/en/changes.md +++ b/user_docs/en/changes.md @@ -30,7 +30,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu * NVDA can now report when a link destination points to the current page. (#141, @LeonarddeR, @nvdaes) * Added an action in the Add-on Store to cancel the install of add-ons. (#15578, @hwf1324) * Added an action in the Add-on Store to retry the installation if the download/installation of an add-on fails. (#17090, @hwf1324) -* It is now possible to specify mirror URLs to use for NVDA updates and the Add-on Store. (#14974, #17151, #17310, @christopherpross) +* It is now possible to specify mirror URLs to use for NVDA updates and the Add-on Store. (#14974, #17151, #17310, #17804, @christopherpross) * The add-ons lists in the Add-on Store can be sorted by columns, including publication date, in ascending and descending order. (#15277, #16681, @nvdaes) * When decreasing or increasing the font size in LibreOffice Writer using the corresponding keyboard shortcuts, NVDA announces the new font size. (#6915, @michaelweghorn) * When applying the "Body Text" or a heading paragraph style using the corresponding keyboard shortcut in LibreOffice Writer 25.2 or newer, NVDA announces the new paragraph style. (#6915, @michaelweghorn)