Your message dated Sun, 20 May 2018 16:35:40 +0000 with message-id <e1fkrj6-0005lh...@fasolo.debian.org> and subject line Bug#898022: fixed in diffoscope 95 has caused the Debian Bug report #898022, regarding diffoscope: Traceback when comparing paths with invalid unicode characters 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.) -- 898022: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898022 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: diffoscope Version: 93 Severity: important Hi, This is via <https://github.com/lamby/trydiffoscope/issues/35>, but I think the bug is in diffoscope itself. So, given the following test: import os import pytest import subprocess def test_invalid_filename(capsys, tmpdir): base = str(tmpdir.mkdir('src')).encode('utf-8') a = os.path.join(base, b'\xf0\x28\x8c\x28') b = os.path.join(base, b'\xf0\x28\x8c\x29') with open(a, 'w'), open(b, 'w'): pass subprocess.check_call(('bin/diffoscope', a, b)) I get: ____________________________ test_invalid_filename _____________________________ capsys = <_pytest.capture.CaptureFixture object at 0x7f25bd267710> tmpdir = local('/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0') def test_invalid_filename(capsys, tmpdir): base = str(tmpdir.mkdir('src')).encode('utf-8') a = os.path.join(base, b'\xf0\x28\x8c\x28') b = os.path.join(base, b'\xf0\x28\x8c\x29') with open(a, 'w'), open(b, 'w'): pass > subprocess.check_call(('bin/diffoscope', a, b)) tests/test_filenames.py:34: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ popenargs = (('bin/diffoscope', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c(', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c)'),) kwargs = {}, retcode = 2 cmd = ('bin/diffoscope', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c(', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c)') def check_call(*popenargs, **kwargs): """Run command with arguments. Wait for command to complete. If the exit code was zero then return, otherwise raise CalledProcessError. The CalledProcessError object will have the return code in the returncode attribute. The arguments are the same as for the call function. Example: check_call(["ls", "-l"]) """ retcode = call(*popenargs, **kwargs) if retcode: cmd = kwargs.get("args") if cmd is None: cmd = popenargs[0] > raise CalledProcessError(retcode, cmd) E subprocess.CalledProcessError: Command '('bin/diffoscope', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c(', b'/tmp/pytest-of-lamby/pytest-43/test_invalid_filename0/src/\xf0(\x8c)')' returned non-zero exit status 2. /usr/lib/python3.6/subprocess.py:291: CalledProcessError ------------------------------ Captured log setup ------------------------------ locale.py 33 DEBUG Normalising locale, timezone, etc. __init__.py 128 DEBUG Loaded 66 comparator classes __init__.py 128 DEBUG Loaded 66 comparator classes ----------------------------- Captured stderr call ----------------------------- Traceback (most recent call last): File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/main.py", line 448, in main sys.exit(run_diffoscope(parsed_args)) File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/main.py", line 420, in run_diffoscope difference = compare_root_paths(path1, path2) File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/compare.py", line 65, in compare_root_paths file1 = specialize(FilesystemFile(path1, container=container1)) File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/specialize.py", line 49, in specialize if try_recognize(file, cls, cls.recognizes): File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/specialize.py", line 36, in try_recognize if not recognizes(file): File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/debian.py", line 169, in recognizes if not super().recognizes(file): File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/file.py", line 141, in recognizes lambda m, t: t.search(m), file.magic_file_type), File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/file.py", line 227, in magic_file_type self._magic_file_type = File.guess_file_type(self.path) File "/home/lamby/git/debian/reproducible/diffoscope/diffoscope/comparators/utils/file.py", line 71, in guess_file_type return self._mimedb.file(path) File "/usr/lib/python3/dist-packages/magic/compat.py", line 148, in file return Magic.__tostr(_file(self._magic_t, Magic.__tobytes(filename))) File "/usr/lib/python3/dist-packages/magic/compat.py", line 138, in __tobytes return bytes(b, 'utf-8') UnicodeEncodeError: 'utf-8' codec can't encode character '\udcf0' in position 58: surrogates not allowed =========================== 1 failed in 0.75 seconds =========================== However, I can't seem to minimally reproduce with file by itself: import magic filename = b'\xf0\x28\x8c\x28' with open(filename, 'w'): pass m = magic.open(magic.NONE) m.load() m.file(filename) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
--- End Message ---
--- Begin Message ---Source: diffoscope Source-Version: 95 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 898...@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, 20 May 2018 17:46:57 +0200 Source: diffoscope Binary: diffoscope Architecture: source Version: 95 Distribution: unstable Urgency: medium Maintainer: Reproducible builds folks <reproducible-bui...@lists.alioth.debian.org> Changed-By: Mattia Rizzolo <mat...@debian.org> Description: diffoscope - in-depth comparison of files, archives, and directories Closes: 872826 898022 898683 Changes: diffoscope (95) unstable; urgency=medium . [ Mattia Rizzolo ] * tests: + test_binary: Don't capture unused output from subprocess. + test_git: Fix test failure on FreeBSD. Closes: #872826 Thanks to Ximin Luo <infini...@debian.org> for the initial patch * Fix handling of filesnames with non-unicode chars. Closes: #898022 * diff: Use bytes as much as possible, to prevent possible encoding issues. * d/control: Make the dependency on python3-distutils an alternative on the previous versions of libpython3.*-stdlib that used to ship it. Closes: #898683 * d/watch: Update URL to the new archive. . [ Chris Lamb ] * The Git repository has been migrated to salsa, update all the references. * Drop extra whitespace in supported file format output. Checksums-Sha1: 782c2ae2fd11e557de59a3b369077879c40d6785 3448 diffoscope_95.dsc 6b3e0c05cfb94459de1169ae612bdcdf36bad6a4 9244552 diffoscope_95.tar.xz cec82d83e5852e0434b4510836b184b5fd285bd5 21700 diffoscope_95_amd64.buildinfo Checksums-Sha256: 1def6a6a0dc17e0291886eee6249597c685027b05ab48af6cc412c6ab192d95f 3448 diffoscope_95.dsc 7991d7680d56315e99efa284cb278915b74f3646e2ae10fc10389c318cf7711c 9244552 diffoscope_95.tar.xz 9323e37a2cbc9cc14b0f0dd4deaa79c29cddfe9612d70ae5016a34a16319af78 21700 diffoscope_95_amd64.buildinfo Files: d2e620a8779cbed99cb1c6444163e100 3448 devel optional diffoscope_95.dsc d8068a84700c902dd7cc2c5fb6f9e8bc 9244552 devel optional diffoscope_95.tar.xz 1f42fe134ee41e3857354614e860ddf4 21700 devel optional diffoscope_95_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEi3hoeGwz5cZMTQpICBa54Yx2K60FAlsBmnMACgkQCBa54Yx2 K62qeQ/+OFubz/aQeKo0zkDAWaOSXAHbTCJdz6LE13KB6qHrMQl9G4+s5wpG2DDb t6DMiHKvQcg4rVSuSvFWIhyIt17Y2wgShLTT4VgN0KHldNjB9s7T9xQHQScNG++o 9HM2OzprRmgR2P+1E+blnJNHtEEt/TxsCmBYgOrdqq7ACrAFmoRPQWI8nZK0qO3B o2VRl4v/GQNagXiTHbHn/63pQXCrK9ZQ0WV+U0BDSaYYa98NpIk5PebvyPi+Itsc QbCkFxFUq07lJQlFqlL+LJUFeg0EnLzkMSRxCfp13rvusFvgAe3HBxQiv4hlTJpF x9gL9tdNB1UiDIbPn7z5vxHS+FDrBDm7D2hXSYjdOmSbszk79yrDxjLllRAijGoZ DH07LZmF+G9U1S74IzLt4e7fmAQb5BzX6/Gjvkv9UVbhbNrdn2CjEz7baAL8wAh7 kgCabsBmjkqnSK5iTj+0MCbpc8CZVNdF5hZRx4XlE5pv/yIKws9kF0gscit7m4Ln FHZdDONf8qTzrq8vYqbVS+RP5KAlE2K6mwP8+qKY9g5vZaZOPVQ9wlT88Wi7YYrG fLeVHCtfjCxO8ecCE6WLu9/0cmvVSECAYjghhYmDpiMpzyAh5/VyRXop9dm4mCI3 abBQ2dXIvImnLNKx8axAofajeGLzzZP7cgj0TJzaBufKg21SKY0= =DK1/ -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ Reproducible-builds mailing list Reproducible-builds@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds
