Hi, I've uploaded a NMU version fixing this[1] and the subsequent one[2] with --delay=5. Feel free to remove it or upload another version.
Attaching debdiff. [1]: https://gitlab.com/volian/nala/-/commit/e12ce19 [2]: https://gitlab.com/volian/nala/-/merge_requests/144/diffs --abhijith
diff -Nru nala-0.15.4/debian/changelog nala-0.15.4+nmu1/debian/changelog --- nala-0.15.4/debian/changelog 2024-09-02 05:02:18.000000000 +0530 +++ nala-0.15.4+nmu1/debian/changelog 2025-04-03 17:26:24.000000000 +0530 @@ -1,3 +1,12 @@ +nala (0.15.4+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix nala upgrade error. (Closes: #1101068) + https://gitlab.com/volian/nala/-/commit/e12ce19 + https://gitlab.com/volian/nala/-/merge_requests/144/diffs + + -- Abhijith PA <abhij...@debian.org> Thu, 03 Apr 2025 17:26:24 +0530 + nala (0.15.4) unstable; urgency=medium [ Bug Fixes ] diff -Nru nala-0.15.4/nala/downloader.py nala-0.15.4+nmu1/nala/downloader.py --- nala-0.15.4/nala/downloader.py 2024-09-02 05:01:00.000000000 +0530 +++ nala-0.15.4+nmu1/nala/downloader.py 2025-04-03 17:25:20.000000000 +0530 @@ -48,11 +48,11 @@ from httpx import ( URL as HttpxUrl, AsyncClient, + AsyncHTTPTransport, ConnectError, ConnectTimeout, HTTPError, HTTPStatusError, - Proxy, RemoteProtocolError, RequestError, get, @@ -271,7 +271,7 @@ self.count: int = 0 self.live: Live self.last_completed: str = "" - self.proxy: dict[HttpxUrl | str, HttpxUrl | str | Proxy | None] = {} + self.proxy: dict[HttpxUrl | str, HttpxUrl | str | AsyncHTTPTransport | None] = {} self.failed: list[str] = [] self.current: Counter[str] = Counter() self.fatal: bool = False @@ -304,7 +304,7 @@ if common_proxy := config.find(f"Acquire::{proto}::Proxy"): # If the proxy is set to direct or false we disable it if common_proxy.lower() not in ("direct", "false"): - self.proxy[f"{proto}://"] = common_proxy + self.proxy[f"{proto}://"] = AsyncHTTPTransport(proxy=common_proxy) # The remainder of code is for proxying specific repos. Such a configuration may look like # Acquire::http::Proxy::deb.volian.org "xxx:8087" @@ -403,7 +403,7 @@ with Live(get_renderable=self._gen_table, refresh_per_second=10) as self.live: async with AsyncClient( timeout=20, - proxies=self.proxy, + mounts=self.proxy, follow_redirects=True, # Custom user agent fixes some downloading issues # Caused by httpx default agent sometimes being blocked.
