JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diffoscope: Fix the OpenPGP test which broke with pgpdump 0.34

Browse Source 
This fixes a regression from the last pgpdump update: 816d311bd0
See https://github.com/NixOS/nixpkgs/pull/149700#issuecomment-991592708

Reported-by: Sergei Trofimovich <slyich@gmail.com>
This commit is contained in:
Michael Weiss 2021-12-11 14:02:17 +01:00
parent 1b11583dfb
commit 0ba695d90e
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/misc/diffoscope/fix-tests.patch
View File

@ -12,3 +12,22 @@ index 8d201ab..05960aa 100644
return get_data(diff_file)
diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff
index 7e90e428..9628efa0 100644
--- a/tests/data/pgp_signed_expected_diff
+++ b/tests/data/pgp_signed_expected_diff
@@ -5,11 +5,11 @@
Key ID - 0x1E953E27D4311E58
Next packet - other than one pass signature
Old: Literal Data Packet(tag 11)(10255 bytes)
- Format - binary
+ Packet data format - binary
- Filename - test1.tar
-- File modified time - Tue Aug 25 11:47:35 UTC 2020
+- Creation time - Tue Aug 25 11:47:35 UTC 2020
+ Filename - test2.tar
-+ File modified time - Tue Aug 25 11:47:38 UTC 2020
++ Creation time - Tue Aug 25 11:47:38 UTC 2020
Literal - ...
Old: Signature Packet(tag 2)(563 bytes)
Ver 4 - new