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-12-05 22:46:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Sun Dec 5 22:46:18 2021 rev:23 rq:935760 version:194 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-11-27 23:43:07.420335669 +0100 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.31177/diffoscope.changes 2021-12-05 22:47:12.509427594 +0100 @@ -1,0 +2,24 @@ +Sun Nov 28 07:31:54 UTC 2021 - Sebastian Wagner <sebix+novell....@sebix.at> + +- update to version 194: + - Don't traceback when comparing nested directories with non-directories. + (Closes: reproducible-builds/diffoscope#288) +- update to version 193: + - Don't duplicate file lists at each directory level. + (Closes: #989192, reproducible-builds/diffoscope#263) + - When pretty-printing JSON, mark the difference as such, additionally + avoiding including the full path. + (Closes: reproducible-builds/diffoscope#205) + - Codebase improvements: + - Update a bunch of %-style string interpolations into f-strings or + str.format. + - Import itertools top-level directly. + - Drop some unused imports. + - Use isinstance(...) over type(...) == + - Avoid aliasing variables if we aren't going to use them. + - Fix missing diff output on large diffs. + - Ignore a Python warning coming from a dependent library (triggered by + supporting Python 3.10) + - Document that support both Python 3.9 and 3.10. + +------------------------------------------------------------------- Old: ---- diffoscope-193.tar.bz2 diffoscope-193.tar.bz2.asc New: ---- diffoscope-194.tar.bz2 diffoscope-194.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.WPfybr/_old 2021-12-05 22:47:12.973426082 +0100 +++ /var/tmp/diff_new_pack.WPfybr/_new 2021-12-05 22:47:12.977426069 +0100 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 193 +Version: 194 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-193.tar.bz2 -> diffoscope-194.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-193/debian/changelog new/diffoscope-194/debian/changelog --- old/diffoscope-193/debian/changelog 2021-11-19 16:35:12.000000000 +0100 +++ new/diffoscope-194/debian/changelog 2021-11-26 19:01:07.000000000 +0100 @@ -1,3 +1,11 @@ +diffoscope (194) unstable; urgency=medium + + [ Chris Lamb ] + * Don't traceback when comparing nested directories with non-directories. + (Closes: reproducible-builds/diffoscope#288) + + -- Chris Lamb <la...@debian.org> Fri, 26 Nov 2021 10:01:05 -0800 + diffoscope (193) unstable; urgency=medium [ Chris Lamb ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-193/diffoscope/__init__.py new/diffoscope-194/diffoscope/__init__.py --- old/diffoscope-193/diffoscope/__init__.py 2021-11-19 16:35:12.000000000 +0100 +++ new/diffoscope-194/diffoscope/__init__.py 2021-11-26 19:01:07.000000000 +0100 @@ -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 = "193" +VERSION = "194" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-193/diffoscope/comparators/directory.py new/diffoscope-194/diffoscope/comparators/directory.py --- old/diffoscope-193/diffoscope/comparators/directory.py 2021-11-19 16:35:12.000000000 +0100 +++ new/diffoscope-194/diffoscope/comparators/directory.py 2021-11-26 19:01:07.000000000 +0100 @@ -253,6 +253,9 @@ def compare(self, other, source=None): differences = [] + if not isinstance(other, FilesystemDirectory): + return differences + # We don't need to recurse into subdirectories; DirectoryContainer will # find them and do that for us. def list_files(path): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-193/diffoscope/comparators/utils/compare.py new/diffoscope-194/diffoscope/comparators/utils/compare.py --- old/diffoscope-193/diffoscope/comparators/utils/compare.py 2021-11-19 16:35:12.000000000 +0100 +++ new/diffoscope-194/diffoscope/comparators/utils/compare.py 2021-11-26 19:01:07.000000000 +0100 @@ -118,8 +118,10 @@ file1.other_file = file2 elif isinstance(file2, MissingFile): file2.other_file = file1 - elif (file1.__class__.__name__ != file2.__class__.__name__) and ( - file1.as_container is None or file2.as_container is None + elif ( + (file1.__class__.__name__ != file2.__class__.__name__) + and (file1.as_container is None or file2.as_container is None) + and (not file1.is_directory() and not file2.is_directory()) ): return file1.compare_bytes(file2, source) with profile("compare_files (cumulative)", file1):
