[Git][reproducible-builds/diffoscope][master] Add a comment about stripping filenames.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
d223012f by Chris Lamb at 2021-05-11T10:20:10+01:00
Add a comment about stripping filenames.

- - - - -


1 changed file:

- diffoscope/comparators/apk.py


Changes:

=====================================
diffoscope/comparators/apk.py
=====================================
@@ -230,9 +230,10 @@ def filter_apk_metadata(filepath, archive_name):
 
     logger.debug("Moving APK metadata from %s to %s", filepath, new_filename)
 
-    re_filename = re.compile(
-        r"^apkFileName: %s" % re.escape(archive_name)
-    )
+    # Strip the filename that was passed to apktool as its embedded in the
+    # output. (It is unclear why this is conditional - see comments on
+    # reproducible-builds/diffoscope#255)
+    re_filename = re.compile(r"^apkFileName: %s" % re.escape(archive_name))
 
     with open(filepath) as in_, open(new_filename, "w") as out:
         out.writelines(x for x in in_ if not re_filename.match(x))



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/d223012faef0c9b017cbf4e185a07da6beac6cd7

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/d223012faef0c9b017cbf4e185a07da6beac6cd7
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/20210511/e2c44cac/attachment.htm>