[Git][reproducible-builds/diffoscope][master] Partially revert 7bf04a62623d234a870fd62b0ee745c9b940f5d7

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
2cd654b4 by Mattia Rizzolo at 2021-05-02T16:57:45+02:00
Partially revert 7bf04a62623d234a870fd62b0ee745c9b940f5d7

This is caused by a bug in `file`:
    https://bugs.astron.com/view.php?id=256
Fixed by:
    https://github.com/file/file/commit/749e1ecfc3d333e5ec8b1a2e639da7ccb2498c34

Closes: reproducible-builds/diffoscope#251
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- tests/data/archive12.diff.txt
- tests/test_presenters.py


Changes:

=====================================
tests/data/archive12.diff.txt
=====================================
@@ -11,5 +11,5 @@
 │ │ +gzip compressed data, was "compressed", last modified: Sun Mar 19 22:27:42 2017, max compression, from Unix, truncated
 │ ├── compressed
 │ │ @@ -1 +1 @@
-│ │ -00000000: 610a                                     a.
-│ │ +00000000: 620a                                     b.
+│ │ -a
+│ │ +b


=====================================
tests/test_presenters.py
=====================================
@@ -85,7 +85,7 @@ def test_text_option_is_default(capsys):
     assert out == get_data("output.txt")
 
 
- at skip_unless_file_version_is_at_least("5.40")
+ at skip_unless_file_version_is_at_least("5.39")
 def test_text_proper_indentation(capsys):
     out = run(capsys, pair=("archive1.tar", "archive2.tar"))
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2cd654b450ce82fb86f55223cc01ba1abdac58a8

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2cd654b450ce82fb86f55223cc01ba1abdac58a8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20210502/25e0b401/attachment.htm>