[Git][reproducible-builds/diffoscope][master] 3 commits: Reduce the --debug log noise by truncating the has_some_content messages.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
a45f01c7 by Chris Lamb at 2020-07-09T15:55:35+01:00
Reduce the --debug log noise by truncating the has_some_content messages.

- - - - -
9dee9450 by Chris Lamb at 2020-07-09T15:56:03+01:00
Fix the compare_files log message when the file does not have a literal name.

- - - - -
d226cf8b by Chris Lamb at 2020-07-09T15:58:26+01:00
Pass the absolute path when extracting members from .squashfs images as we run the command with working directory in a temporary directory. (Closes: reproducible-builds/diffoscope#189, Debian:#964365)

- - - - -


3 changed files:

- diffoscope/comparators/squashfs.py
- diffoscope/comparators/utils/compare.py
- diffoscope/comparators/utils/file.py


Changes:

=====================================
diffoscope/comparators/squashfs.py
=====================================
@@ -269,7 +269,7 @@ class SquashfsContainer(Archive):
                 "-li",
                 "-d",
                 ".",
-                self.source.path,
+                os.path.abspath(self.source.path),
             ),
             stderr=subprocess.PIPE,
             cwd=self._temp_dir,


=====================================
diffoscope/comparators/utils/compare.py
=====================================
@@ -87,9 +87,9 @@ def compare_root_paths(path1, path2):
 def compare_files(file1, file2, source=None, diff_content_only=False):
     logger.debug(
         "Comparing %s (%s) and %s (%s)",
-        file1.name,
+        file1.name or "-",
         file1.__class__.__name__,
-        file2.name,
+        file2.name or "-",
         file2.__class__.__name__,
     )
 


=====================================
diffoscope/comparators/utils/file.py
=====================================
@@ -412,7 +412,9 @@ class File(metaclass=abc.ABCMeta):
         return difference
 
     def has_same_content_as(self, other):
-        logger.debug("File.has_same_content: %s %s", self, other)
+        logger.debug(
+            "has_same_content(%s, %s)", self.path or "-", other.path or "-"
+        )
         if os.path.isdir(self.path) or os.path.isdir(other.path):
             return False
         # try comparing small files directly first



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/572fc2827832017ee3044543742da6ed03c2cac2...d226cf8b9cf9a4138463b71294194d3bb5bf2106

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/572fc2827832017ee3044543742da6ed03c2cac2...d226cf8b9cf9a4138463b71294194d3bb5bf2106
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/20200709/2562c251/attachment.htm>