[Git][reproducible-builds/diffoscope][master] 2 commits: Correct tense in --debug log output.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
456f6c3b by Chris Lamb at 2020-12-07T10:20:53+00:00
Correct tense in --debug log output.

- - - - -
41360e51 by Chris Lamb at 2020-12-07T10:28:40+00:00
Use pprint.pformat in the JSON comparator to serialise the differneces from jsondiff.

- - - - -


2 changed files:

- diffoscope/comparators/deb.py
- diffoscope/comparators/json.py


Changes:

=====================================
diffoscope/comparators/deb.py
=====================================
@@ -230,7 +230,7 @@ class DebTarContainer(TarContainer):
                 and my_md5sums.get(my_member.name, "my")
                 == other_md5sums.get(other_member.name, "other")
             ):
-                logger.debug("Skip %s: identical md5sum", my_member.name)
+                logger.debug("Skipping %s: identical md5sum", my_member.name)
                 continue
             yield my_member, other_member, comment
 


=====================================
diffoscope/comparators/json.py
=====================================
@@ -19,6 +19,7 @@
 
 import re
 import json
+import pprint
 import logging
 import collections
 
@@ -95,9 +96,7 @@ class JSONFile(File):
             difference.add_comment(f"Similarity: {similarity}%")
 
         difference.add_comment(
-            "Differences: {}".format(
-                json.dumps(diff, indent=2, sort_keys=True)
-            )
+            "Differences: {}".format(pprint.pformat(diff, width=100))
         )
 
     @staticmethod



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/45d7567ffac5254f5211715d74420296cc9ee50e...41360e51c2cdd71d43da2bf1b570de7c3f9c7688

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/45d7567ffac5254f5211715d74420296cc9ee50e...41360e51c2cdd71d43da2bf1b570de7c3f9c7688
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/20201207/f5e0f48d/attachment.htm>