Control: tags + patch

On Mon, 03 Jul 2017 14:02:49 +0300 Adrian Bunk <b...@debian.org> wrote:
> Some recent change in unstable makes botch FTBFS:
> 
> https://tests.reproducible-builds.org/debian/history/botch.html
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/botch.html
> 
> ...
> /usr/bin/make test
> make[2]: Entering directory '/build/1st/botch-0.21'
> # FIXME: add more tests
> #./tests.py
> #OCAMLPATH=/build/1st/botch-0.21/dose/_build ocamlbuild -classic-display 
> -use-ocamlfind -cflags "-w +a-4-9-24" tests.native
> #./tests.native
> pyflakes3 tools/*.py
> # E402 is triggered by the sys.path.append() statement in front of import of 
> utils
> # see https://github.com/PyCQA/pycodestyle/issues/264
> pycodestyle --ignore=E402 tools/*.py
> tools/calcportsmetric.py:87:9: E722 do not use bare except'
> tools/dose2html.py:595:17: E722 do not use bare except'
> tools/util.py:125:9: E722 do not use bare except'
> Makefile:311: recipe for target 'test-python' failed
> make[2]: *** [test-python] Error 1
> make[2]: Leaving directory '/build/1st/botch-0.21'
> debian/rules:25: recipe for target 'override_dh_auto_test-arch' failed
> make[1]: *** [override_dh_auto_test-arch] Error 2
> 

Fixed by Dimitri John Ledkov in Ubuntu. Patch attached.
diff -pruN 0.21-3/debian/changelog 0.21-3ubuntu1/debian/changelog
--- 0.21-3/debian/changelog	2017-01-28 22:32:39.000000000 +0000
+++ 0.21-3ubuntu1/debian/changelog	2017-07-07 13:05:28.000000000 +0000
@@ -1,3 +1,10 @@
+botch (0.21-3ubuntu1) artful; urgency=medium
+
+  * Workaround new pycodestyle by ignoring newly emitted tags. (closes:
+    #867005).
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Fri, 07 Jul 2017 14:04:45 +0100
+
 botch (0.21-3) unstable; urgency=medium
 
   * Add patch to fix FTBFS due to API breakage introduced by src:dose3 5.0.1-8
diff -pruN 0.21-3/debian/patches/fix-ftbfs-new-pycodestyle.patch 0.21-3ubuntu1/debian/patches/fix-ftbfs-new-pycodestyle.patch
--- 0.21-3/debian/patches/fix-ftbfs-new-pycodestyle.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.21-3ubuntu1/debian/patches/fix-ftbfs-new-pycodestyle.patch	2017-07-07 13:04:43.000000000 +0000
@@ -0,0 +1,14 @@
+Description: ignore E722 errors newly emitted by pycodestyle
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867005
+
+--- a/Makefile
++++ b/Makefile
+@@ -315,7 +315,7 @@
+ 	pyflakes3 tools/*.py
+ 	# E402 is triggered by the sys.path.append() statement in front of import of utils
+ 	# see https://github.com/PyCQA/pycodestyle/issues/264
+-	pycodestyle --ignore=E402 tools/*.py
++	pycodestyle --ignore=E402,E722 tools/*.py
+ 
+ .PHONY: test
+ test: test-python test-man test-default test-selfcontained test-cross test-misc
diff -pruN 0.21-3/debian/patches/series 0.21-3ubuntu1/debian/patches/series
--- 0.21-3/debian/patches/series	2017-01-28 21:47:50.000000000 +0000
+++ 0.21-3ubuntu1/debian/patches/series	2017-07-07 13:03:28.000000000 +0000
@@ -1,2 +1,3 @@
+fix-ftbfs-new-pycodestyle.patch
 python3-pygraphviz-dropped-the-file-attr
 add-patch-to-fix-ftbfs-due-to-api-breaka

Attachment: signature.asc
Description: signature

Reply via email to