Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2021-05-21 21:50:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Fri May 21 21:50:28 2021 rev:10 rq:894846 version:175 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-05-15 01:24:45.062906188 +0200 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.2988/diffoscope.changes 2021-05-21 21:50:45.362049576 +0200 @@ -1,0 +2,12 @@ +Fri May 14 16:24:12 UTC 2021 - Sebastian Wagner <sebix+novell....@sebix.at> + +- update to version 175: + * 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-generated "1.apk" instead + of "original-filename.apk". (Closes: reproducible-builds/diffoscope#255) + * Don't call os.path.basename twice. + * Correct grammar in a fsimage.py debug message. + * Add a comment about stripping filenames. + +------------------------------------------------------------------- Old: ---- diffoscope-174.tar.bz2 diffoscope-174.tar.bz2.asc New: ---- diffoscope-175.tar.bz2 diffoscope-175.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.OUHPhl/_old 2021-05-21 21:50:45.946047157 +0200 +++ /var/tmp/diff_new_pack.OUHPhl/_new 2021-05-21 21:50:45.950047141 +0200 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 174 +Version: 175 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-174.tar.bz2 -> diffoscope-175.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-174/debian/changelog new/diffoscope-175/debian/changelog --- old/diffoscope-174/debian/changelog 2021-05-07 11:48:57.000000000 +0200 +++ new/diffoscope-175/debian/changelog 2021-05-14 11:43:13.000000000 +0200 @@ -1,3 +1,15 @@ +diffoscope (175) unstable; urgency=medium + + * 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-generated "1.apk" instead + of "original-filename.apk". (Closes: reproducible-builds/diffoscope#255) + * Don't call os.path.basename twice. + * Correct grammar in a fsimage.py debug message. + * Add a comment about stripping filenames. + + -- Chris Lamb <la...@debian.org> Fri, 14 May 2021 10:43:10 +0100 + diffoscope (174) unstable; urgency=medium [ Chris Lamb ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-174/diffoscope/__init__.py new/diffoscope-175/diffoscope/__init__.py --- old/diffoscope-174/diffoscope/__init__.py 2021-05-07 11:48:57.000000000 +0200 +++ new/diffoscope-175/diffoscope/__init__.py 2021-05-14 11:43:13.000000000 +0200 @@ -17,4 +17,4 @@ # You should have received a copy of the GNU General Public License # along with diffoscope. If not, see <https://www.gnu.org/licenses/>. -VERSION = "174" +VERSION = "175" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-174/diffoscope/comparators/apk.py new/diffoscope-175/diffoscope/comparators/apk.py --- old/diffoscope-174/diffoscope/comparators/apk.py 2021-05-07 11:48:57.000000000 +0200 +++ new/diffoscope-175/diffoscope/comparators/apk.py 2021-05-14 11:43:13.000000000 +0200 @@ -2,7 +2,7 @@ # diffoscope: in-depth comparison of files, archives, and directories # # Copyright ?? 2016 Reiner Herrmann <rei...@reiner-h.de> -# Copyright ?? 2016-2020 Chris Lamb <la...@debian.org> +# Copyright ?? 2016-2021 Chris Lamb <la...@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 @@ # 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) @@ -230,9 +230,10 @@ logger.debug("Moving APK metadata from %s to %s", filepath, new_filename) - re_filename = re.compile( - r"^apkFileName: %s" % re.escape(os.path.basename(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)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-174/diffoscope/comparators/fsimage.py new/diffoscope-175/diffoscope/comparators/fsimage.py --- old/diffoscope-174/diffoscope/comparators/fsimage.py 2021-05-07 11:48:57.000000000 +0200 +++ new/diffoscope-175/diffoscope/comparators/fsimage.py 2021-05-14 11:43:13.000000000 +0200 @@ -54,7 +54,7 @@ logger.debug("Launching guestfs; this may take some time") with profile("command", "guestfs"): self.g.launch() - logger.debug("guestfs successful launched") + logger.debug("guestfs successfully launched") except RuntimeError: logger.exception("guestfs failed to launch") logger.error(
