Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Tristan Seligmann <mithra...@debian.org>, Julien Cristau
<jcris...@debian.org>
Please unblock package mercurial
mercurial (5.6.1-3) unstable; urgency=medium
* Team upload.
[ Helmut Grohne ]
* Annotate test dependencies <!nocheck> (closes: #980337).
[ Stefano Rivera ]
* python-3.9.2.patch: Use "&" instead of ";" as query string separator
in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
default. (closes: #986514)
-- Stefano Rivera <stefa...@debian.org> Fri, 21 May 2021 12:06:47 -0400
[ Reason ]
Fixes FTBFS with Python 3.9.2+. See #986514
[ Impact ]
FTBFS + autopkgtest failure.
[ Tests ]
It's a test change (and marking dependencies <!nocheck>)
[ Risks ]
Patch is from upstream, and Ubuntu has carried it for a month, without
issue.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock mercurial/5.6.1-3
diff -Nru mercurial-5.6.1/debian/changelog mercurial-5.6.1/debian/changelog
--- mercurial-5.6.1/debian/changelog 2021-02-01 12:47:09.000000000 -0400
+++ mercurial-5.6.1/debian/changelog 2021-05-21 12:06:47.000000000 -0400
@@ -1,3 +1,18 @@
+mercurial (5.6.1-3) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Helmut Grohne ]
+ * Annotate test dependencies <!nocheck> (closes: #980337).
+
+ [ Stefano Rivera ]
+ * python-3.9.2.patch: Use "&" instead of ";" as query string separator
+ in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
+ urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
+ default. (closes: #986514)
+
+ -- Stefano Rivera <stefa...@debian.org> Fri, 21 May 2021 12:06:47 -0400
+
mercurial (5.6.1-2) unstable; urgency=medium
* tests: make test-subrepo-git.t compatible with git's master->main
diff -Nru mercurial-5.6.1/debian/control mercurial-5.6.1/debian/control
--- mercurial-5.6.1/debian/control 2021-02-01 12:39:12.000000000 -0400
+++ mercurial-5.6.1/debian/control 2021-05-21 12:06:47.000000000 -0400
@@ -10,14 +10,14 @@
debhelper-compat (= 13),
dh-python,
gettext,
- netbase,
- patchutils (>= 0.2.25),
+ netbase <!nocheck>,
+ patchutils (>= 0.2.25) <!nocheck>,
python3-all-dev,
python3-docutils,
python3-roman,
- rename,
- unzip,
- zip,
+ rename <!nocheck>,
+ unzip <!nocheck>,
+ zip <!nocheck>,
less <!nocheck>,
Standards-Version: 4.5.0
Homepage: https://www.mercurial-scm.org/
diff -Nru mercurial-5.6.1/debian/patches/python-3.9.2.patch
mercurial-5.6.1/debian/patches/python-3.9.2.patch
--- mercurial-5.6.1/debian/patches/python-3.9.2.patch 1969-12-31
20:00:00.000000000 -0400
+++ mercurial-5.6.1/debian/patches/python-3.9.2.patch 2021-05-21
12:06:47.000000000 -0400
@@ -0,0 +1,34 @@
+From: Martin von Zweigbergk <martinv...@google.com>
+Date: Fri, 21 May 2021 12:03:33 -0400
+Subject: tests: make test-archive.t pass on py3.9 (issue6504)
+
+Something got stricter at parsing URL query parameters and now the
+parameters need to be separated by "&"; ";" is no longer allowed. See
+issue6504 for details.
+
+Differential Revision: https://phab.mercurial-scm.org/D10472
+
+Origin: upstream, https://www.mercurial-scm.org/repo/hg/rev/dc8976cc3a6e
+Bug-Debian: https://bugs.debian.org/986514
+Bug-upstream: https://bz.mercurial-scm.org/show_bug.cgi?id=6504
+---
+ tests/test-archive.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-archive.t b/tests/test-archive.t
+index 606c9e2..384a04a 100644
+--- a/tests/test-archive.t
++++ b/tests/test-archive.t
+@@ -334,10 +334,10 @@ invalid arch type should give 404
+ > pass
+ > if len(sys.argv) <= 3:
+ > node, archive = sys.argv[1:]
+- > requeststr = 'cmd=archive;node=%s;type=%s' % (node, archive)
++ > requeststr = 'cmd=archive&node=%s&type=%s' % (node, archive)
+ > else:
+ > node, archive, file = sys.argv[1:]
+- > requeststr = 'cmd=archive;node=%s;type=%s;file=%s' % (node, archive,
file)
++ > requeststr = 'cmd=archive&node=%s&type=%s&file=%s' % (node, archive,
file)
+ > try:
+ > stdout = sys.stdout.buffer
+ > except AttributeError:
diff -Nru mercurial-5.6.1/debian/patches/series
mercurial-5.6.1/debian/patches/series
--- mercurial-5.6.1/debian/patches/series 2021-02-01 12:46:24.000000000
-0400
+++ mercurial-5.6.1/debian/patches/series 2021-05-21 12:06:47.000000000
-0400
@@ -4,3 +4,4 @@
deb_specific__optional-dependencies
deb_specific__disable_libdir_replacement.patch
0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch
+python-3.9.2.patch
