Merge ~hectorcao/ubuntu/+source/fetchmail:lp2139104 into ubuntu/+source/fetchmail:ubuntu/devel

[Hector CAO]

[Christian Ehrhardt (paelzer)]

- please refer to https://docs.python.org/3/whatsnew/3.14.html#pep-765-control-flow-in-finally-blocks

- please rebase on the latest version, remember tell your sponsors to use -v$latestversion

- the fix IMHO should be fixing it for real, maybe assign retval=0, =1 in the except and then return after the finally block

- report debian bug OR salsa PR to fix this there, refer to it in your commit

review: Needs Fixing

[Hector CAO (hectorcao)]

Hello @paelzer,

- I rebased the MR on ubuntu/devel
- I refreshed the fix to not use allow-stderr
- I reported the issue to Debian

Please take a look again

64c4558... by Hector CAO on 2026-02-09

merge-changelogs

dc3a476... by Hector CAO on 2026-02-09

reconstruct-changelog

e8602f2... by Hector CAO on 2026-02-09

changelog 6.6.2-2

Unmerged commits

e8602f2... by Hector CAO on 2026-02-09

changelog 6.6.2-2

dc3a476... by Hector CAO on 2026-02-09

reconstruct-changelog

64c4558... by Hector CAO on 2026-02-09

merge-changelogs

diff --git a/debian/changelog b/debian/changelog
index 900e653..9e66a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fetchmail (6.5.4-0ubuntu4) resolute; urgency=medium
+
+  * d/t/mock-pop3-server.py : fix return value in except/finally block
+     (LP: #2139104)
+
+ -- Hector Cao <[e-mail]>  Fri, 06 Feb 2026 15:26:31 +0100
+
 fetchmail (6.5.4-0ubuntu3) resolute; urgency=medium
 
   * No-change mass rebuild for Ubuntu 26.04 (LP: #2132257)
diff --git a/debian/tests/mock-pop3-server.py b/debian/tests/mock-pop3-server.py
index 159069b..b1af47b 100644
--- a/debian/tests/mock-pop3-server.py
+++ b/debian/tests/mock-pop3-server.py
@@ -172,6 +172,7 @@ def serve(messages_filename, host=DEFAULT_HOST, port=DEFAULT_PORT):
 
     mailbox = Mailbox(messages_filename)
 
+    ret = 0
     try:
         dbg("* mock-pop3-server ready on {}:{}".format(host, port))
         while True:
@@ -190,15 +191,14 @@ def serve(messages_filename, host=DEFAULT_HOST, port=DEFAULT_PORT):
                 server.close()
     except KeyboardInterrupt:
         dbg("* mock-pop3-server interrupted")
-        return 1
+        ret = 1
     except SystemExit:
         dbg("* mock-pop3-server exiting")
-        return 1
+        ret = 1
     finally:
         sock.shutdown(socket.SHUT_RDWR)
         sock.close()
-        return 0
-
+    return ret
 
 if __name__ == "__main__":
     fd, message_filename = mkstemp(prefix='message-', suffix='.txt')