Your message dated Sun, 03 Sep 2017 21:05:06 +0000
with message-id <e1doc4o-000dkt...@fasolo.debian.org>
and subject line Bug#871029: fixed in diffoscope 86
has caused the Debian Bug report #871029,
regarding BSD diff tool causes 5 errors in test suite
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
871029: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871029
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: diffoscope
Version: 84
Severity: normal
Some test cases failed when running diffoscope test suite on FreeBSD. Most of
the issues are caused by the difference between BSD Diff (`diff` on FreeBSD)
and GNU Diff (`gdiff` on FreeBSD).
Diffoscope should use `gdiff` when available. I will make sure that `gdiff` is
a dependency of diffoscope in FreeBSD Ports.
A proposed patch is attached. Not sure if this implementation is clean enough
though.
diff --git a/diffoscope/diff.py b/diffoscope/diff.py
index 17a5289..bf46ec6 100644
--- a/diffoscope/diff.py
+++ b/diffoscope/diff.py
@@ -31,11 +31,19 @@ from multiprocessing.dummy import Queue
from diffoscope.tempfiles import get_temporary_directory
+from distutils.spawn import find_executable
+
from .tools import tool_required
from .config import Config
DIFF_CHUNK = 4096
+DIFF_TOOL = 'diff'
+
+gdiff_path = find_executable('gdiff')
+if gdiff_path:
+ DIFF_TOOL = 'gdiff'
+
logger = logging.getLogger(__name__)
re_diff_change = re.compile(r'^([+-@]).*', re.MULTILINE)
@@ -159,9 +167,9 @@ class DiffParser(object):
return self.skip_block
-@tool_required('diff')
+@tool_required(DIFF_TOOL)
def run_diff(fifo1, fifo2, end_nl_q1, end_nl_q2):
- cmd = ['diff', '-aU7', fifo1, fifo2]
+ cmd = [DIFF_TOOL, '-aU7', fifo1, fifo2]
logger.debug("Running %s", ' '.join(cmd))
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 86
We believe that the bug you reported is fixed in the latest version of
diffoscope, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 871...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mattia Rizzolo <mat...@debian.org> (supplier of updated diffoscope package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 03 Sep 2017 22:23:06 +0200
Source: diffoscope
Binary: diffoscope
Architecture: source
Version: 86
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks
<reproducible-builds@lists.alioth.debian.org>
Changed-By: Mattia Rizzolo <mat...@debian.org>
Description:
diffoscope - in-depth comparison of files, archives, and directories
Closes: 869868 871029 871413 873157
Changes:
diffoscope (86) unstable; urgency=medium
.
[ Mattia Rizzolo ]
* tests:
+ binary: skip a test if the 'distro' module is not available.
+ iso9660: avoid an overly-catching exception.
* debian/copyright: coalesce some file paragraphs and update information.
.
[ Guangyuan Yang ]
* tests:
+ iso9660: support both cdrtools' genisoimage's versions of isoinfo.
.
[ Chris Lamb ]
* comparators:
+ xml: Use ``name`` attribute over ``path`` to avoid leaking comparison
full path in output.
* Tidy diffoscope.progress a little.
.
[ Ximin Luo ]
* Add a --tool-prefix-binutils CLI flag. Closes: #869868
* On non-GNU systems, prefer some tools that start with "g". Closes: #871029
* presenters:
+ html:
- Don't traverse children whose parents were already limited.
Closes: #871413
.
[ Santiago Torres-Arias ]
* diffoscope.progress:
+ Support the new fork of python-progressbar. Closes: #873157
Checksums-Sha1:
aab4a3e5b9b0a60eeeb326f650a4a594fe7b3941 3228 diffoscope_86.dsc
ad1161e33bbbc745cec26d8f6155f75c4dcc97f8 653940 diffoscope_86.tar.xz
387289e22ab928f6c328e8e815a1aac4c74c1bbd 18609 diffoscope_86_amd64.buildinfo
Checksums-Sha256:
192e6a68074b4af726075be96a54b1ef299596ebe60032da2974b400ccbac6ae 3228
diffoscope_86.dsc
99e0f70a4ea420a5b4fa9404a05198b0da18023ea0c8a8fee7857a207aab05ed 653940
diffoscope_86.tar.xz
a8f59fd9e6e0958bf903c79b9cc47b71aa1978e61b4bfe63a12c9ad1129b50e2 18609
diffoscope_86_amd64.buildinfo
Files:
a5d1c6e61ad8c0a43bff7a49f5db9e55 3228 devel optional diffoscope_86.dsc
f7531bd0502197a582b79a4febb20cf3 653940 devel optional diffoscope_86.tar.xz
dd377aa5c966848f49d9cae26e05a620 18609 devel optional
diffoscope_86_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEi3hoeGwz5cZMTQpICBa54Yx2K60FAlmsZuYACgkQCBa54Yx2
K601NhAAgOmO+75WKqufQGAIvHcT8imKaKDk4Of0Hr9tVoGQbFVtjeK63Y/iccxO
1GnTxAaPAQEPtGaFW8aMf183AjfLfvxO60JVoKi4WBOzdqycZYMryeertF9AeCUP
1BBE8Of8P3+zLZ7OSNX8OcXIzBAvhuu/Uw0WS1gwtFWHNeax8KhFeg8O6SKPZVe3
BuB/bsIpEwcuIf2AFHnaPAfJyG4tqbmGZMz9S1MAmk1w51Ggpbe9PXLgAWAsPS0u
51I+TGycOmvUP445fhWj8wCj2dI0FuUyVnanMjVO4KqUpmkmktXeJ2OU0H8VipDq
rsLXA/QRluo/gVnxFUYh7SjaL4QwPtJkb3HTytpEVV1H/hqq3JtZMyfntd0tR3rW
W9F9X/AVuCZBcBka2kg5umAB6utMAqrfYQ+Cym2mVs/pd85AAeGnShviIlXZgyhN
ccq+PaGgGX9nWYFnmP8TGrniZUI3dUXx9cLYtmPuITFuqWtVGOkLOZuGAEQzsaaB
qdeqv95ldGIyPg984sgFYgML3jek/jkB+bpnkAHD/D5PwY8wjJY23kqb+AgWLPUA
GqnokpxT95kuVYJMTy4m02RptTSV+fGdUTeUWeuJpskQLPYf3bZEfHxIVkaosiYT
tWHVq9DlVM5oQ0/dMNGgd95+WZr/BR4+s8ETCDLrhmok8ZD0g4g=
=tLgy
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
