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-10-11 15:31:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Mon Oct 11 15:31:28 2021 rev:19 rq:924342 version:186 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-10-04 18:40:46.790136944 +0200 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.2443/diffoscope.changes 2021-10-11 15:32:24.522921101 +0200 @@ -1,0 +2,13 @@ +Fri Oct 1 18:33:10 UTC 2021 - Sebastian Wagner <sebix+novell....@sebix.at> + +- update to version 186: + - Don't call close_archive when garbage-collecting Archive instances unless + open_archive returned successfully. This prevents, amongst others, an + AttributeError traceback due to PGPContainer's cleanup routines assuming + that its temporary directory had been created. + (Closes: reproducible-builds/diffoscope#276) + - Ensure that the string "RPM archives" exists in the package description, + regardless of whether python3-rpm is installed or not at build time. + - Fix the LVM Macho comparator for non-x86-64 architectures. + +------------------------------------------------------------------- Old: ---- diffoscope-185.tar.bz2 diffoscope-185.tar.bz2.asc New: ---- diffoscope-186.tar.bz2 diffoscope-186.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.eh9ZfO/_old 2021-10-11 15:32:24.978921832 +0200 +++ /var/tmp/diff_new_pack.eh9ZfO/_new 2021-10-11 15:32:24.982921839 +0200 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 185 +Version: 186 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-185.tar.bz2 -> diffoscope-186.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-185/debian/changelog new/diffoscope-186/debian/changelog --- old/diffoscope-185/debian/changelog 2021-09-21 17:15:21.000000000 +0200 +++ new/diffoscope-186/debian/changelog 2021-10-01 10:02:51.000000000 +0200 @@ -1,3 +1,19 @@ +diffoscope (186) unstable; urgency=medium + + [ Chris Lamb ] + * Don't call close_archive when garbage-collecting Archive instances unless + open_archive returned successfully. This prevents, amongst others, an + AttributeError traceback due to PGPContainer's cleanup routines assuming + that its temporary directory had been created. + (Closes: reproducible-builds/diffoscope#276) + * Ensure that the string "RPM archives" exists in the package description, + regardless of whether python3-rpm is installed or not at build time. + + [ Jean-Romain Garnier ] + * Fix the LVM Macho comparator for non-x86-64 architectures. + + -- Chris Lamb <la...@debian.org> Fri, 01 Oct 2021 09:02:48 +0100 + diffoscope (185) unstable; urgency=medium [ Mattia Rizzolo ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-185/diffoscope/__init__.py new/diffoscope-186/diffoscope/__init__.py --- old/diffoscope-185/diffoscope/__init__.py 2021-09-21 17:15:21.000000000 +0200 +++ new/diffoscope-186/diffoscope/__init__.py 2021-10-01 10:02:51.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 = "185" +VERSION = "186" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-185/diffoscope/comparators/macho.py new/diffoscope-186/diffoscope/comparators/macho.py --- old/diffoscope-185/diffoscope/comparators/macho.py 2021-09-21 17:15:21.000000000 +0200 +++ new/diffoscope-186/diffoscope/comparators/macho.py 2021-10-01 10:02:51.000000000 +0200 @@ -294,7 +294,7 @@ def objdump_options(self): return [ - f"--arch-name={self._arch}", + f"--arch={self._arch}", f"--section={self._section}", "--macho", "--demangle", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-185/diffoscope/comparators/rpm_fallback.py new/diffoscope-186/diffoscope/comparators/rpm_fallback.py --- old/diffoscope-185/diffoscope/comparators/rpm_fallback.py 2021-09-21 17:15:21.000000000 +0200 +++ new/diffoscope-186/diffoscope/comparators/rpm_fallback.py 2021-10-01 10:02:51.000000000 +0200 @@ -27,6 +27,8 @@ class RpmFile(AbstractRpmFile): + DESCRIPTION = "RPM archives" + def compare(self, other, source=None): difference = self.compare_bytes(other) if not difference: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-185/diffoscope/comparators/utils/archive.py new/diffoscope-186/diffoscope/comparators/utils/archive.py --- old/diffoscope-185/diffoscope/comparators/utils/archive.py 2021-09-21 17:15:21.000000000 +0200 +++ new/diffoscope-186/diffoscope/comparators/utils/archive.py 2021-10-01 10:02:51.000000000 +0200 @@ -41,10 +41,22 @@ super().__init__(*args, **kwargs) with profile("open_archive", self): self._archive = self.open_archive() + self._opened = True def __del__(self): - with profile("close_archive", self): - self.close_archive() + """ + __del__ can be called even if __init__ did not fully complete. This + becomes an issue if an `open_archive` call fails (due to a faulty + archive, missing dependency, etc.), and close_archive then assumes that + it was opened successfully. + + We therefore track whether open_archive actually worked, and only call + close_archive if that was the case. (#276) + """ + + if hasattr(self, "_opened"): + with profile("close_archive", self): + self.close_archive() @property def archive(self):
