[Git][reproducible-builds/diffoscope][master] 2 commits: Report when the GNU_BUILD_ID field has been modified

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
5c166d92 by Roland Clobus at 2021-12-08T09:38:19+01:00
Report when the GNU_BUILD_ID field has been modified

- - - - -
9acd83bd by Roland Clobus at 2021-12-08T09:39:00+01:00
Cosmetic: Update usage of whitespace in comments

- - - - -


2 changed files:

- diffoscope/comparators/elf.py
- diffoscope/presenters/html/html.py


Changes:

=====================================
diffoscope/comparators/elf.py
=====================================
@@ -662,9 +662,11 @@ class ElfContainer(DecompilableContainer):
         )
 
         if hashlib.sha1(blob_with_reset_build_id).hexdigest() != build_id:
+            self.source.add_comment(
+                f"The file ({self.source.path}) has been modified after NT_GNU_BUILD_ID has been applied"
+            )
             logger.warning(
-                "The file (%s) has been modified after NT_GNU_BUILD_ID has been applied",
-                self.source.path,
+                f"The file ({self.source.path}) has been modified after NT_GNU_BUILD_ID has been applied"
             )
             logger.debug(
                 "Expected value: %s Current value: %s",


=====================================
diffoscope/presenters/html/html.py
=====================================
@@ -247,8 +247,8 @@ def output_node(ctx, difference, path, indentstr, indentnum):
 
     comments = ""
     if difference.comments:
-        comments = '{1[1]}<div class="comment {0}">{2}{1[1]}</div>\n'.format(
-            "multiline" if len(difference.comments) > 1 else "",
+        comments = '{1[1]}<div class="comment{0}">{2}\n{1[1]}</div>\n'.format(
+            " multiline" if len(difference.comments) > 1 else "",
             indent,
             "\n".join(html.escape(x) for x in difference.comments),
         )



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/aa1abf07fa61142557bf729667eebc914e066532...9acd83bd8c136fce0832b3193d74b3dc0834c553

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/aa1abf07fa61142557bf729667eebc914e066532...9acd83bd8c136fce0832b3193d74b3dc0834c553
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/20211208/9ac3cd95/attachment.htm>