[Git][reproducible-builds/diffoscope][master] 4 commits: Update copyright years.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
1e782e18 by Chris Lamb at 2024-05-10T13:29:25+01:00
Update copyright years.

- - - - -
ac8a5070 by Chris Lamb at 2024-05-10T14:59:53+01:00
Strip the first line from the xz --list output.

- - - - -
9f77675d by Chris Lamb at 2024-05-10T14:59:53+01:00
releasing package diffoscope version 266

- - - - -
01d6fd76 by Chris Lamb at 2024-05-10T15:01:41+01:00
Open new changelog entry for version 267.

Gbp-Dch: ignore

- - - - -


7 changed files:

- debian/changelog
- diffoscope/__init__.py
- diffoscope/comparators/xz.py
- tests/comparators/test_containers.py
- tests/comparators/test_elf.py
- tests/comparators/test_xz.py
- tests/data/text_xz_list


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,25 @@
-diffoscope (266) UNRELEASED; urgency=medium
+diffoscope (267) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby at debian.org>  Fri, 19 Apr 2024 10:16:49 +0100
+ -- Chris Lamb <lamby at debian.org>  Fri, 10 May 2024 15:01:40 +0100
+
+diffoscope (266) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Use "xz --list" to supplement the output when comparing .xz archives;
+    essential when some underlying metadata differs. (Closes: #1069329)
+  * Actually append the xz --list after the container differences, as it
+    simplifies tests and the output.
+  * Add 7zip to <!nocheck> Build-Depends in debian/control.
+  * Update copyright years.
+
+  [ James Addison ]
+  * Maintain an in-header boolean state to determine whether to drop
+    from-file/to-file lines. This fixes an issue where HTML differences were
+    being inadvertendly neglected. (Closes: reproducible-builds/diffoscope#372)
+
+ -- Chris Lamb <lamby at debian.org>  Fri, 10 May 2024 13:49:03 +0100
 
 diffoscope (265) unstable; urgency=medium
 


=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "265"
+VERSION = "266"


=====================================
diffoscope/comparators/xz.py
=====================================
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby at debian.org>
+# Copyright © 2015-2020, 2024 Chris Lamb <lamby at debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,12 @@ class XZList(Command):
     def cmdline(self):
         return ("xz", "--list", "--verbose", self.path)
 
+    def filter(self, line):
+        # Strip the first line
+        if line.startswith(self.path.encode("utf-8")):
+            return b""
+        return line
+
 
 class XzContainer(Archive):
     def open_archive(self):


=====================================
tests/comparators/test_containers.py
=====================================
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2017 Juliana Oliveira R <juliana.orod at gmail.org>
-# Copyright © 2017-2020 Chris Lamb <lamby at debian.org>
+# Copyright © 2017-2020, 2024 Chris Lamb <lamby at debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


=====================================
tests/comparators/test_elf.py
=====================================
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
-# Copyright © 2015-2022 Chris Lamb <lamby at debian.org>
+# Copyright © 2015-2022, 2024 Chris Lamb <lamby at debian.org>
 # Copyright © 2021 Jean-Romain Garnier <salsa at jean-romain.com>
 #
 # diffoscope is free software: you can redistribute it and/or modify


=====================================
tests/comparators/test_xz.py
=====================================
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
-# Copyright © 2016-2017, 2020 Chris Lamb <lamby at debian.org>
+# Copyright © 2016-2017, 2020, 2024 Chris Lamb <lamby at debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


=====================================
tests/data/text_xz_list
=====================================
@@ -1,6 +1,4 @@
-@@ -1,14 +1,14 @@
--/home/lamby/git/debian/reproducible-builds/diffoscope/tests/data/test1.xz (1/1)
-+/home/lamby/git/debian/reproducible-builds/diffoscope/tests/data/test2.xz (1/1)
+@@ -1,13 +1,13 @@
    Streams:           1
    Blocks:            1
 -  Compressed size:   388 B



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/4a685bbb57caecc8d9455a2bd6fdb47f11a221ec...01d6fd7671f8300d204755633df2953d16344e32

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/4a685bbb57caecc8d9455a2bd6fdb47f11a221ec...01d6fd7671f8300d204755633df2953d16344e32
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/20240514/5ec498e5/attachment.htm>