Control: tags 912929 + patch
Control: tags 912929 + pending
Control: tags 912931 + pending


Dear maintainer,

I've prepared an NMU for xapers (versioned as 0.8.2-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for xapers-0.8.2 xapers-0.8.2

 changelog                |    9 +++++++++
 control                  |    1 -
 patches/fail-tests.patch |   28 ++++++++++++++++++++++++++++
 patches/python3.7.patch  |   32 ++++++++++++++++++++++++++++++++
 patches/series           |    2 ++
 5 files changed, 71 insertions(+), 1 deletion(-)

diff -Nru xapers-0.8.2/debian/changelog xapers-0.8.2/debian/changelog
--- xapers-0.8.2/debian/changelog	2017-08-08 17:36:24.000000000 +0200
+++ xapers-0.8.2/debian/changelog	2018-12-20 13:37:27.000000000 +0100
@@ -1,3 +1,12 @@
+xapers (0.8.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unnecessary Testsuite field from debian/control.
+  * Add patch to make the testsuite fatal during build.  Closes: #912929
+  * Add patch to fix compatibility with Python 3.7.  Closes: #912931
+
+ -- Mattia Rizzolo <mat...@debian.org>  Thu, 20 Dec 2018 13:37:27 +0100
+
 xapers (0.8.2-1) unstable; urgency=medium
 
   * New minor release (Closes: #779601, #823964, #870289)
diff -Nru xapers-0.8.2/debian/control xapers-0.8.2/debian/control
--- xapers-0.8.2/debian/control	2017-08-08 17:36:24.000000000 +0200
+++ xapers-0.8.2/debian/control	2018-12-20 13:36:18.000000000 +0100
@@ -15,7 +15,6 @@
 Standards-Version: 4.0.0
 Homepage: https://finestructure.net/xapers
 Vcs-Git: https://finestructure.net/git/xapers
-Testsuite: autopkgtest
 
 Package: xapers
 Architecture: all
diff -Nru xapers-0.8.2/debian/patches/fail-tests.patch xapers-0.8.2/debian/patches/fail-tests.patch
--- xapers-0.8.2/debian/patches/fail-tests.patch	1970-01-01 01:00:00.000000000 +0100
+++ xapers-0.8.2/debian/patches/fail-tests.patch	2018-12-20 13:34:25.000000000 +0100
@@ -0,0 +1,28 @@
+Description: make the testsuite fail when a test fails
+Author: Mattia Rizzolo <mat...@debian.org>
+Bug-Debian: https://bugs.debian.org/912929
+Forwarded: no
+Last-Update: 2018-12-20
+
+--- a/test/test-aggregate-results
++++ b/test/test-aggregate-results
+@@ -79,3 +79,8 @@
+     tests=$(pluralize "test" $skipped)
+     echo "$skipped $tests skipped."
+ fi
++
++if [ $failed -gt 0 ]; then
++    echo "Testsuite failed!"
++    exit 1
++fi
+--- a/test/xapers-test
++++ b/test/xapers-test
+@@ -46,7 +46,7 @@
+ trap - HUP INT TERM
+ 
+ # Report results
+-./test-aggregate-results test-results/*
++./test-aggregate-results test-results/* || exit 1
+ 
+ # Clean up
+ rm -rf test-result
diff -Nru xapers-0.8.2/debian/patches/python3.7.patch xapers-0.8.2/debian/patches/python3.7.patch
--- xapers-0.8.2/debian/patches/python3.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ xapers-0.8.2/debian/patches/python3.7.patch	2018-12-20 13:33:14.000000000 +0100
@@ -0,0 +1,32 @@
+Description: Fixes for Python 3.7
+ PEP 472 changes how StopIteration is handled inside generators -- it no
+ longer bubbles out but instead causes an error.
+Author: Michael Hudson-Doyle <mwhud...@debian.org>
+Acked-By: Mattia Rizzolo <mat...@debian.org>
+Bug-Debian: https://bugs.debian.org/912931
+Last-Update: 2018-12-20
+
+--- a/lib/xapers/util.py
++++ b/lib/xapers/util.py
+@@ -9,12 +9,18 @@
+     term_iter = iter(xapian_object)
+     if prefix:
+         plen = len(prefix)
+-        term = term_iter.skip_to(prefix).term.decode()
++        try:
++            term = term_iter.skip_to(prefix).term.decode()
++        except StopIteration:
++            return
+         if not term.startswith(prefix):
+             return
+         yield term[plen:]
+     for tli in term_iter:
+-        term = tli.term.decode()
++        try:
++            term = tli.term.decode()
++        except StopIteration:
++            return
+         if prefix:
+             if not term.startswith(prefix):
+                 break
+
diff -Nru xapers-0.8.2/debian/patches/series xapers-0.8.2/debian/patches/series
--- xapers-0.8.2/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ xapers-0.8.2/debian/patches/series	2018-12-20 13:31:52.000000000 +0100
@@ -0,0 +1,2 @@
+fail-tests.patch
+python3.7.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to