[Git][reproducible-builds/diffoscope][master] 2 commits: Don't use parenthesis within test "skiping…" messages, as PyTest adds its own parenthesis.
Chris Lamb (@lamby)
gitlab at salsa.debian.org
Fri Mar 29 13:35:50 UTC 2024
Chris Lamb pushed to branch master at Reproducible Builds / diffoscope
Commits:
f30387bd by Chris Lamb at 2024-03-29T13:34:58+00:00
Don't use parenthesis within test "skiping…" messages, as PyTest adds its own parenthesis.
- - - - -
c598dfa7 by Chris Lamb at 2024-03-29T13:35:19+00:00
Fix EPUB tests after supporting zipdetails.
- - - - -
3 changed files:
- tests/comparators/test_epub.py
- tests/data/epub_expected_diffs
- tests/utils/tools.py
Changes:
=====================================
tests/comparators/test_epub.py
=====================================
@@ -45,16 +45,18 @@ def differences(epub1, epub2):
return epub1.compare(epub2).details
- at skip_unless_tools_exist("zipinfo")
+ at skip_unless_tools_exist("zipinfo", "zipdetails")
def test_differences(differences):
assert differences[0].source1 == "zipinfo {}"
assert differences[0].source2 == "zipinfo {}"
- assert differences[1].source1 == "content.opf"
- assert differences[1].source2 == "content.opf"
- assert differences[2].source1 == "toc.ncx"
- assert differences[2].source2 == "toc.ncx"
- assert differences[3].source1 == "ch001.xhtml"
- assert differences[3].source2 == "ch001.xhtml"
+ assert differences[1].source1.startswith("zipdetails ")
+ assert differences[1].source2.startswith("zipdetails ")
+ assert differences[2].source1 == "content.opf"
+ assert differences[2].source2 == "content.opf"
+ assert differences[3].source1 == "toc.ncx"
+ assert differences[3].source2 == "toc.ncx"
+ assert differences[4].source1 == "ch001.xhtml"
+ assert differences[4].source2 == "ch001.xhtml"
# Flatten everything recursively, as XMLFile will contain reformatted data
# under Difference.details.
=====================================
tests/data/epub_expected_diffs
=====================================
@@ -22,6 +22,628 @@
+-rw---- 0.0 fat 615 b- defX 15-Oct-27 11:33 ch001.xhtml
+9 files, 4535 bytes uncompressed, 2325 bytes compressed: 48.7%
+@@ -1,15 +1,15 @@
+
+ 0000 LOCAL HEADER #1 04034B50
+ 0004 Extract Zip Spec 14 '2.0'
+ 0005 Extract OS 00 'MS-DOS'
+ 0006 General Purpose Flag 0802
+ [Bit 11] 1 'Language Encoding'
+ 0008 Compression Method 0000 'Stored'
+-000A Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
++000A Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
+ 000E CRC 2CAB616F
+ 0012 Compressed Length 00000014
+ 0016 Uncompressed Length 00000014
+ 001A Filename Length 0008
+ 001C Extra Length 0000
+ 001E Filename 'XXXXXXXX'
+ 0026 PAYLOAD XXXXXXXXXXXXXXXXXXXX
+@@ -17,15 +17,15 @@
+ 003A LOCAL HEADER #2 04034B50
+ 003E Extract Zip Spec 14 '2.0'
+ 003F Extract OS 00 'MS-DOS'
+ 0040 General Purpose Flag 0802
+ [Bits 1-2] 1 'Maximum Compression'
+ [Bit 11] 1 'Language Encoding'
+ 0042 Compression Method 0008 'Deflated'
+-0044 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
++0044 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
+ 0048 CRC E8E295AE
+ 004C Compressed Length 000000A6
+ 0050 Uncompressed Length 000000F6
+ 0054 Filename Length 0016
+ 0056 Extra Length 0000
+ 0058 Filename 'XXXXXXXX/XXXXXXXXXXXXX'
+ 006E PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+@@ -37,15 +37,15 @@
+ 0114 LOCAL HEADER #3 04034B50
+ 0118 Extract Zip Spec 14 '2.0'
+ 0119 Extract OS 00 'MS-DOS'
+ 011A General Purpose Flag 0802
+ [Bits 1-2] 1 'Maximum Compression'
+ [Bit 11] 1 'Language Encoding'
+ 011C Compression Method 0008 'Deflated'
+-011E Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
++011E Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
+ 0122 CRC D2F87677
+ 0126 Compressed Length 00000077
+ 012A Uncompressed Length 000000A0
+ 012E Filename Length 002D
+ 0130 Extra Length 0000
+ 0132 Filename 'XXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXX'
+@@ -56,15 +56,15 @@
+ 01D6 LOCAL HEADER #4 04034B50
+ 01DA Extract Zip Spec 14 '2.0'
+ 01DB Extract OS 00 'MS-DOS'
+ 01DC General Purpose Flag 0802
+ [Bits 1-2] 1 'Maximum Compression'
+ [Bit 11] 1 'Language Encoding'
+ 01DE Compression Method 0008 'Deflated'
+-01E0 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
++01E0 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
+ 01E4 CRC 36B16E47
+ 01E8 Compressed Length 000000DD
+ 01EC Uncompressed Length 000001B7
+ 01F0 Filename Length 000E
+ 01F2 Extra Length 0000
+ 01F4 Filename 'XXXXXXXXXXXXXX'
+ 0202 PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+@@ -77,15 +77,15 @@
+ 02DF LOCAL HEADER #5 04034B50
+ 02E3 Extract Zip Spec 14 '2.0'
+ 02E4 Extract OS 00 'MS-DOS'
+ 02E5 General Purpose Flag 0802
+ [Bits 1-2] 1 'Maximum Compression'
+ [Bit 11] 1 'Language Encoding'
+ 02E7 Compression Method 0008 'Deflated'
+-02E9 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
++02E9 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
+ 02ED CRC A3412ABF
+ 02F1 Compressed Length 0000012E
+ 02F5 Uncompressed Length 00000211
+ 02F9 Filename Length 0010
+ 02FB Extra Length 0000
+ 02FD Filename 'XXXXXXXXXXXXXXXX'
+ 030D PAYLOAD
+@@ -93,280 +93,280 @@
+ 043B LOCAL HEADER #6 04034B50
+ 043F Extract Zip Spec 14 '2.0'
+ 0440 Extract OS 00 'MS-DOS'
+ 0441 General Purpose Flag 0802
+ [Bits 1-2] 1 'Maximum Compression'
+ [Bit 11] 1 'Language Encoding'
+ 0443 Compression Method 0008 'Deflated'
+-0445 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0449 CRC 6F2D6A7B
+-044D Compressed Length 000001DC
++0445 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0449 CRC A618897D
++044D Compressed Length 000001DB
+ 0451 Uncompressed Length 00000469
+ 0455 Filename Length 000B
+ 0457 Extra Length 0000
+ 0459 Filename 'XXXXXXXXXXX'
+ 0464 PAYLOAD
+
+-0640 LOCAL HEADER #7 04034B50
+-0644 Extract Zip Spec 14 '2.0'
+-0645 Extract OS 00 'MS-DOS'
+-0646 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0648 Compression Method 0008 'Deflated'
+-064A Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-064E CRC 165BC787
+-0652 Compressed Length 0000013E
+-0656 Uncompressed Length 000002E6
+-065A Filename Length 0007
+-065C Extra Length 0000
+-065E Filename 'XXXXXXX'
+-0665 PAYLOAD
+-
+-07A3 LOCAL HEADER #8 04034B50
+-07A7 Extract Zip Spec 14 '2.0'
+-07A8 Extract OS 00 'MS-DOS'
+-07A9 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-07AB Compression Method 0008 'Deflated'
+-07AD Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-07B1 CRC 2539C443
+-07B5 Compressed Length 0000015F
+-07B9 Uncompressed Length 0000028F
+-07BD Filename Length 0009
+-07BF Extra Length 0000
+-07C1 Filename 'XXXXXXXXX'
+-07CA PAYLOAD
+-
+-0929 LOCAL HEADER #9 04034B50
+-092D Extract Zip Spec 14 '2.0'
+-092E Extract OS 00 'MS-DOS'
+-092F General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0931 Compression Method 0008 'Deflated'
+-0933 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0937 CRC EEB610EE
+-093B Compressed Length 00000163
+-093F Uncompressed Length 00000267
+-0943 Filename Length 000B
+-0945 Extra Length 0000
+-0947 Filename 'XXXXXXXXXXX'
+-0952 PAYLOAD
+-
+-0AB9 CENTRAL HEADER #1 02014B50
+-0ABD Created Zip Spec 00 '0.0'
+-0ABE Created OS 00 'MS-DOS'
+-0ABF Extract Zip Spec 14 '2.0'
+-0AC0 Extract OS 00 'MS-DOS'
+-0AC1 General Purpose Flag 0802
+- [Bit 11] 1 'Language Encoding'
+-0AC3 Compression Method 0000 'Stored'
+-0AC5 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0AC9 CRC 2CAB616F
+-0ACD Compressed Length 00000014
+-0AD1 Uncompressed Length 00000014
+-0AD5 Filename Length 0008
+-0AD7 Extra Length 0000
+-0AD9 Comment Length 0000
+-0ADB Disk Start 0000
+-0ADD Int File Attributes 0000
++063F LOCAL HEADER #7 04034B50
++0643 Extract Zip Spec 14 '2.0'
++0644 Extract OS 00 'MS-DOS'
++0645 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0647 Compression Method 0008 'Deflated'
++0649 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++064D CRC CF78BAE5
++0651 Compressed Length 0000013C
++0655 Uncompressed Length 000002E6
++0659 Filename Length 0007
++065B Extra Length 0000
++065D Filename 'XXXXXXX'
++0664 PAYLOAD
++
++07A0 LOCAL HEADER #8 04034B50
++07A4 Extract Zip Spec 14 '2.0'
++07A5 Extract OS 00 'MS-DOS'
++07A6 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++07A8 Compression Method 0008 'Deflated'
++07AA Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++07AE CRC 2539C443
++07B2 Compressed Length 0000015F
++07B6 Uncompressed Length 0000028F
++07BA Filename Length 0009
++07BC Extra Length 0000
++07BE Filename 'XXXXXXXXX'
++07C7 PAYLOAD
++
++0926 LOCAL HEADER #9 04034B50
++092A Extract Zip Spec 14 '2.0'
++092B Extract OS 00 'MS-DOS'
++092C General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++092E Compression Method 0008 'Deflated'
++0930 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0934 CRC D2D6F3E6
++0938 Compressed Length 00000163
++093C Uncompressed Length 00000267
++0940 Filename Length 000B
++0942 Extra Length 0000
++0944 Filename 'XXXXXXXXXXX'
++094F PAYLOAD
++
++0AB6 CENTRAL HEADER #1 02014B50
++0ABA Created Zip Spec 00 '0.0'
++0ABB Created OS 00 'MS-DOS'
++0ABC Extract Zip Spec 14 '2.0'
++0ABD Extract OS 00 'MS-DOS'
++0ABE General Purpose Flag 0802
++ [Bit 11] 1 'Language Encoding'
++0AC0 Compression Method 0000 'Stored'
++0AC2 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0AC6 CRC 2CAB616F
++0ACA Compressed Length 00000014
++0ACE Uncompressed Length 00000014
++0AD2 Filename Length 0008
++0AD4 Extra Length 0000
++0AD6 Comment Length 0000
++0AD8 Disk Start 0000
++0ADA Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0ADF Ext File Attributes 00000000
+-0AE3 Local Header Offset 00000000
+-0AE7 Filename 'XXXXXXXX'
+-
+-0AEB CENTRAL HEADER #2 02014B50
+-0AEF Created Zip Spec 00 '0.0'
+-0AF0 Created OS 00 'MS-DOS'
+-0AF1 Extract Zip Spec 14 '2.0'
+-0AF2 Extract OS 00 'MS-DOS'
+-0AF3 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0AF5 Compression Method 0008 'Deflated'
+-0AF7 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0AFB CRC E8E295AE
+-0AFF Compressed Length 000000A6
+-0B03 Uncompressed Length 000000F6
+-0B07 Filename Length 0016
+-0B09 Extra Length 0000
+-0B0B Comment Length 0000
+-0B0D Disk Start 0000
+-0B0F Int File Attributes 0000
++0ADC Ext File Attributes 00000000
++0AE0 Local Header Offset 00000000
++0AE4 Filename 'XXXXXXXX'
++
++0AE8 CENTRAL HEADER #2 02014B50
++0AEC Created Zip Spec 00 '0.0'
++0AED Created OS 00 'MS-DOS'
++0AEE Extract Zip Spec 14 '2.0'
++0AEF Extract OS 00 'MS-DOS'
++0AF0 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0AF2 Compression Method 0008 'Deflated'
++0AF4 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0AF8 CRC E8E295AE
++0AFC Compressed Length 000000A6
++0B00 Uncompressed Length 000000F6
++0B04 Filename Length 0016
++0B06 Extra Length 0000
++0B08 Comment Length 0000
++0B0A Disk Start 0000
++0B0C Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0B11 Ext File Attributes 00000000
+-0B15 Local Header Offset 0000003A
+-0B19 Filename 'XXXXXXXX/XXXXXXXXXXXXX'
+-
+-0B2F CENTRAL HEADER #3 02014B50
+-0B33 Created Zip Spec 00 '0.0'
+-0B34 Created OS 00 'MS-DOS'
+-0B35 Extract Zip Spec 14 '2.0'
+-0B36 Extract OS 00 'MS-DOS'
+-0B37 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0B39 Compression Method 0008 'Deflated'
+-0B3B Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0B3F CRC D2F87677
+-0B43 Compressed Length 00000077
+-0B47 Uncompressed Length 000000A0
+-0B4B Filename Length 002D
+-0B4D Extra Length 0000
+-0B4F Comment Length 0000
+-0B51 Disk Start 0000
+-0B53 Int File Attributes 0000
++0B0E Ext File Attributes 00000000
++0B12 Local Header Offset 0000003A
++0B16 Filename 'XXXXXXXX/XXXXXXXXXXXXX'
++
++0B2C CENTRAL HEADER #3 02014B50
++0B30 Created Zip Spec 00 '0.0'
++0B31 Created OS 00 'MS-DOS'
++0B32 Extract Zip Spec 14 '2.0'
++0B33 Extract OS 00 'MS-DOS'
++0B34 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0B36 Compression Method 0008 'Deflated'
++0B38 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0B3C CRC D2F87677
++0B40 Compressed Length 00000077
++0B44 Uncompressed Length 000000A0
++0B48 Filename Length 002D
++0B4A Extra Length 0000
++0B4C Comment Length 0000
++0B4E Disk Start 0000
++0B50 Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0B55 Ext File Attributes 00000000
+-0B59 Local Header Offset 00000114
+-0B5D Filename 'XXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
++0B52 Ext File Attributes 00000000
++0B56 Local Header Offset 00000114
++0B5A Filename 'XXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXX'
+
+-0B8A CENTRAL HEADER #4 02014B50
+-0B8E Created Zip Spec 00 '0.0'
+-0B8F Created OS 00 'MS-DOS'
+-0B90 Extract Zip Spec 14 '2.0'
+-0B91 Extract OS 00 'MS-DOS'
+-0B92 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0B94 Compression Method 0008 'Deflated'
+-0B96 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0B9A CRC 36B16E47
+-0B9E Compressed Length 000000DD
+-0BA2 Uncompressed Length 000001B7
+-0BA6 Filename Length 000E
+-0BA8 Extra Length 0000
+-0BAA Comment Length 0000
+-0BAC Disk Start 0000
+-0BAE Int File Attributes 0000
++0B87 CENTRAL HEADER #4 02014B50
++0B8B Created Zip Spec 00 '0.0'
++0B8C Created OS 00 'MS-DOS'
++0B8D Extract Zip Spec 14 '2.0'
++0B8E Extract OS 00 'MS-DOS'
++0B8F General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0B91 Compression Method 0008 'Deflated'
++0B93 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0B97 CRC 36B16E47
++0B9B Compressed Length 000000DD
++0B9F Uncompressed Length 000001B7
++0BA3 Filename Length 000E
++0BA5 Extra Length 0000
++0BA7 Comment Length 0000
++0BA9 Disk Start 0000
++0BAB Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0BB0 Ext File Attributes 00000000
+-0BB4 Local Header Offset 000001D6
+-0BB8 Filename 'XXXXXXXXXXXXXX'
+-
+-0BC6 CENTRAL HEADER #5 02014B50
+-0BCA Created Zip Spec 00 '0.0'
+-0BCB Created OS 00 'MS-DOS'
+-0BCC Extract Zip Spec 14 '2.0'
+-0BCD Extract OS 00 'MS-DOS'
+-0BCE General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0BD0 Compression Method 0008 'Deflated'
+-0BD2 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0BD6 CRC A3412ABF
+-0BDA Compressed Length 0000012E
+-0BDE Uncompressed Length 00000211
+-0BE2 Filename Length 0010
+-0BE4 Extra Length 0000
+-0BE6 Comment Length 0000
+-0BE8 Disk Start 0000
+-0BEA Int File Attributes 0000
++0BAD Ext File Attributes 00000000
++0BB1 Local Header Offset 000001D6
++0BB5 Filename 'XXXXXXXXXXXXXX'
++
++0BC3 CENTRAL HEADER #5 02014B50
++0BC7 Created Zip Spec 00 '0.0'
++0BC8 Created OS 00 'MS-DOS'
++0BC9 Extract Zip Spec 14 '2.0'
++0BCA Extract OS 00 'MS-DOS'
++0BCB General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0BCD Compression Method 0008 'Deflated'
++0BCF Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0BD3 CRC A3412ABF
++0BD7 Compressed Length 0000012E
++0BDB Uncompressed Length 00000211
++0BDF Filename Length 0010
++0BE1 Extra Length 0000
++0BE3 Comment Length 0000
++0BE5 Disk Start 0000
++0BE7 Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0BEC Ext File Attributes 00000000
+-0BF0 Local Header Offset 000002DF
+-0BF4 Filename 'XXXXXXXXXXXXXXXX'
+-
+-0C04 CENTRAL HEADER #6 02014B50
+-0C08 Created Zip Spec 00 '0.0'
+-0C09 Created OS 00 'MS-DOS'
+-0C0A Extract Zip Spec 14 '2.0'
+-0C0B Extract OS 00 'MS-DOS'
+-0C0C General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0C0E Compression Method 0008 'Deflated'
+-0C10 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0C14 CRC 6F2D6A7B
+-0C18 Compressed Length 000001DC
+-0C1C Uncompressed Length 00000469
+-0C20 Filename Length 000B
+-0C22 Extra Length 0000
+-0C24 Comment Length 0000
+-0C26 Disk Start 0000
+-0C28 Int File Attributes 0000
++0BE9 Ext File Attributes 00000000
++0BED Local Header Offset 000002DF
++0BF1 Filename 'XXXXXXXXXXXXXXXX'
++
++0C01 CENTRAL HEADER #6 02014B50
++0C05 Created Zip Spec 00 '0.0'
++0C06 Created OS 00 'MS-DOS'
++0C07 Extract Zip Spec 14 '2.0'
++0C08 Extract OS 00 'MS-DOS'
++0C09 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0C0B Compression Method 0008 'Deflated'
++0C0D Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0C11 CRC A618897D
++0C15 Compressed Length 000001DB
++0C19 Uncompressed Length 00000469
++0C1D Filename Length 000B
++0C1F Extra Length 0000
++0C21 Comment Length 0000
++0C23 Disk Start 0000
++0C25 Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0C2A Ext File Attributes 00000000
+-0C2E Local Header Offset 0000043B
+-0C32 Filename 'XXXXXXXXXXX'
+-
+-0C3D CENTRAL HEADER #7 02014B50
+-0C41 Created Zip Spec 00 '0.0'
+-0C42 Created OS 00 'MS-DOS'
+-0C43 Extract Zip Spec 14 '2.0'
+-0C44 Extract OS 00 'MS-DOS'
+-0C45 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0C47 Compression Method 0008 'Deflated'
+-0C49 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0C4D CRC 165BC787
+-0C51 Compressed Length 0000013E
+-0C55 Uncompressed Length 000002E6
+-0C59 Filename Length 0007
+-0C5B Extra Length 0000
+-0C5D Comment Length 0000
+-0C5F Disk Start 0000
+-0C61 Int File Attributes 0000
++0C27 Ext File Attributes 00000000
++0C2B Local Header Offset 0000043B
++0C2F Filename 'XXXXXXXXXXX'
++
++0C3A CENTRAL HEADER #7 02014B50
++0C3E Created Zip Spec 00 '0.0'
++0C3F Created OS 00 'MS-DOS'
++0C40 Extract Zip Spec 14 '2.0'
++0C41 Extract OS 00 'MS-DOS'
++0C42 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0C44 Compression Method 0008 'Deflated'
++0C46 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0C4A CRC CF78BAE5
++0C4E Compressed Length 0000013C
++0C52 Uncompressed Length 000002E6
++0C56 Filename Length 0007
++0C58 Extra Length 0000
++0C5A Comment Length 0000
++0C5C Disk Start 0000
++0C5E Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0C63 Ext File Attributes 00000000
+-0C67 Local Header Offset 00000640
+-0C6B Filename 'XXXXXXX'
+-
+-0C72 CENTRAL HEADER #8 02014B50
+-0C76 Created Zip Spec 00 '0.0'
+-0C77 Created OS 00 'MS-DOS'
+-0C78 Extract Zip Spec 14 '2.0'
+-0C79 Extract OS 00 'MS-DOS'
+-0C7A General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0C7C Compression Method 0008 'Deflated'
+-0C7E Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0C82 CRC 2539C443
+-0C86 Compressed Length 0000015F
+-0C8A Uncompressed Length 0000028F
+-0C8E Filename Length 0009
+-0C90 Extra Length 0000
+-0C92 Comment Length 0000
+-0C94 Disk Start 0000
+-0C96 Int File Attributes 0000
++0C60 Ext File Attributes 00000000
++0C64 Local Header Offset 0000063F
++0C68 Filename 'XXXXXXX'
++
++0C6F CENTRAL HEADER #8 02014B50
++0C73 Created Zip Spec 00 '0.0'
++0C74 Created OS 00 'MS-DOS'
++0C75 Extract Zip Spec 14 '2.0'
++0C76 Extract OS 00 'MS-DOS'
++0C77 General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0C79 Compression Method 0008 'Deflated'
++0C7B Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0C7F CRC 2539C443
++0C83 Compressed Length 0000015F
++0C87 Uncompressed Length 0000028F
++0C8B Filename Length 0009
++0C8D Extra Length 0000
++0C8F Comment Length 0000
++0C91 Disk Start 0000
++0C93 Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0C98 Ext File Attributes 00000000
+-0C9C Local Header Offset 000007A3
+-0CA0 Filename 'XXXXXXXXX'
+-
+-0CA9 CENTRAL HEADER #9 02014B50
+-0CAD Created Zip Spec 00 '0.0'
+-0CAE Created OS 00 'MS-DOS'
+-0CAF Extract Zip Spec 14 '2.0'
+-0CB0 Extract OS 00 'MS-DOS'
+-0CB1 General Purpose Flag 0802
+- [Bits 1-2] 1 'Maximum Compression'
+- [Bit 11] 1 'Language Encoding'
+-0CB3 Compression Method 0008 'Deflated'
+-0CB5 Last Mod Time 475B5C1B 'Tue Oct 27 11:32:54 2015'
+-0CB9 CRC EEB610EE
+-0CBD Compressed Length 00000163
+-0CC1 Uncompressed Length 00000267
+-0CC5 Filename Length 000B
+-0CC7 Extra Length 0000
+-0CC9 Comment Length 0000
+-0CCB Disk Start 0000
+-0CCD Int File Attributes 0000
++0C95 Ext File Attributes 00000000
++0C99 Local Header Offset 000007A0
++0C9D Filename 'XXXXXXXXX'
++
++0CA6 CENTRAL HEADER #9 02014B50
++0CAA Created Zip Spec 00 '0.0'
++0CAB Created OS 00 'MS-DOS'
++0CAC Extract Zip Spec 14 '2.0'
++0CAD Extract OS 00 'MS-DOS'
++0CAE General Purpose Flag 0802
++ [Bits 1-2] 1 'Maximum Compression'
++ [Bit 11] 1 'Language Encoding'
++0CB0 Compression Method 0008 'Deflated'
++0CB2 Last Mod Time 475B5C2A 'Tue Oct 27 11:33:20 2015'
++0CB6 CRC D2D6F3E6
++0CBA Compressed Length 00000163
++0CBE Uncompressed Length 00000267
++0CC2 Filename Length 000B
++0CC4 Extra Length 0000
++0CC6 Comment Length 0000
++0CC8 Disk Start 0000
++0CCA Int File Attributes 0000
+ [Bit 0] 0 'Binary Data'
+-0CCF Ext File Attributes 00000000
+-0CD3 Local Header Offset 00000929
+-0CD7 Filename 'XXXXXXXXXXX'
+-
+-0CE2 END CENTRAL HEADER 06054B50
+-0CE6 Number of this disk 0000
+-0CE8 Central Dir Disk no 0000
+-0CEA Entries in this disk 0009
+-0CEC Total Entries 0009
+-0CEE Size of Central Dir 0000022D
+-0CF2 Offset to Central Dir 00000AB5
+-0CF6 Comment Length 0000
++0CCC Ext File Attributes 00000000
++0CD0 Local Header Offset 00000926
++0CD4 Filename 'XXXXXXXXXXX'
++
++0CDF END CENTRAL HEADER 06054B50
++0CE3 Number of this disk 0000
++0CE5 Central Dir Disk no 0000
++0CE7 Entries in this disk 0009
++0CE9 Total Entries 0009
++0CEB Size of Central Dir 0000022D
++0CEF Offset to Central Dir 00000AB2
++0CF3 Comment Length 0000
+ Done
+
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="epub-id-1">
=====================================
tests/utils/tools.py
=====================================
@@ -226,7 +226,7 @@ def reason(*tools, force_include=False):
xs.append(x)
continue
- xs.append("{} (try installing {})".format(x, provider))
+ xs.append("{}; try installing {}".format(x, provider))
if not xs:
return ""
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/d9dfe40dc77030f062533fa96ccba43db6ebbf89...c598dfa7eb8f9f7e7a183ea413bc1051cf1d8a0c
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/d9dfe40dc77030f062533fa96ccba43db6ebbf89...c598dfa7eb8f9f7e7a183ea413bc1051cf1d8a0c
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/20240329/970a7681/attachment.htm>
More information about the rb-commits
mailing list