[Git][reproducible-builds/diffoscope][master] Use the actual filesystem path name instead of diffoscope's concept of the...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
6bf636c9 by Chris Lamb at 2021-05-10T11:52:35+01:00
Use the actual filesystem path name instead of diffoscope's concept of the source name to correct APK filename filtering when an APK file is in another container. We need to filter the auto-incremented "1.apk" instead of "original.pk". (Closes: reproducible-builds/diffoscope#255)

- - - - -


1 changed file:

- diffoscope/comparators/apk.py


Changes:

=====================================
diffoscope/comparators/apk.py
=====================================
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2016 Reiner Herrmann <reiner at reiner-h.de>
-# Copyright © 2016-2020 Chris Lamb <lamby at debian.org>
+# Copyright © 2016-2021 Chris Lamb <lamby at debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ class ApkContainer(Archive):
                 # reproducibility.
                 if filename == "apktool.yml":
                     abspath = filter_apk_metadata(
-                        abspath, os.path.basename(self.source.name)
+                        abspath, os.path.basename(self.source.path)
                     )
                     relpath = abspath[len(self._unpacked) + 1 :]
                     current_dir.insert(0, relpath)



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6bf636c9f4e9f7d5b300723855bb2ac6cb9b11a1
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/20210510/e23c4960/attachment.htm>