[Git][reproducible-builds/diffoscope][master] Fix test failures with upcoming file(1) 5.35. Thanks to Christoph Biedl for the…

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
0dfb8182 by Daniel Shahaf at 2018-11-04T11:36:12Z
Fix test failures with upcoming file(1) 5.35. Thanks to Christoph Biedl for the heads-up in advance. (Closes: #912756)

The regexp now covers both libmagic < 5.35 and libmagic >= 5.35.

Signed-off-by: Chris Lamb <lamby at debian.org>

- - - - -


1 changed file:

- diffoscope/comparators/pcap.py


Changes:

=====================================
diffoscope/comparators/pcap.py
=====================================
@@ -40,7 +40,7 @@ class Tcpdump(Command):
 
 class PcapFile(File):
     DESCRIPTION = "tcpdump capture files (.pcap)"
-    FILE_TYPE_RE = re.compile(r'^tcpdump capture file\b')
+    FILE_TYPE_RE = re.compile(r'^(tcpdump|pcap) capture file\b')
 
     def compare_details(self, other, source=None):
         return [Difference.from_command(



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/0dfb8182fed6491296e1c1014351e00b29e59d8e
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/20181104/9e76f8a5/attachment.html>