[Git][reproducible-builds/diffoscope][master] Correct the matching of R .rds files by also detecting newer versions of this file format.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
2c9fbc13 by Chris Lamb at 2019-10-29T21:14:11Z
Correct the matching of R .rds files by also detecting newer versions of this file format.

- - - - -


1 changed file:

- diffoscope/comparators/rdata.py


Changes:

=====================================
diffoscope/comparators/rdata.py
=====================================
@@ -30,7 +30,10 @@ import logging
 import binascii
 
 
-HEADER = binascii.a2b_hex("580a000000020003")
+RDS_HEADERS = {
+    binascii.a2b_hex("580a000000020003"),
+    binascii.a2b_hex("580a000000030003"),
+}
 
 DUMP_RDB = rb"""
 hideOutput = lazyLoad(commandArgs(TRUE));
@@ -128,7 +131,7 @@ class RdsFile(File):
             or file.container
             and check_rds_extension(file.container.source)
         ):
-            return file.file_header.startswith(HEADER)
+            return file.file_header[:8] in RDS_HEADERS
         return False
 
     def compare_details(self, other, source=None):



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/2c9fbc138a11dc6d5bb88f642c0ef245a1949d5a
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/20191029/e53adb65/attachment.htm>