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-24 20:23:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diffoscope (Old)
and /work/SRC/openSUSE:Factory/.diffoscope.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope"
Fri Dec 24 20:23:20 2021 rev:25 rq:942345 version:197
Changes:
--------
--- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-12-12
00:58:02.222601991 +0100
+++ /work/SRC/openSUSE:Factory/.diffoscope.new.2520/diffoscope.changes
2021-12-24 20:23:42.778036172 +0100
@@ -1,0 +2,13 @@
+Fri Dec 17 11:59:51 UTC 2021 - Sebastian Wagner <sebix+novell....@sebix.at>
+
+- - update to version 197:
+ - Drop unnecessary has_same_content_as logging calls.
+ - Ignore the new "binary-with-bad-dynamic-table" Lintian tag.
+ - Support pgpdump 0.34 in the tests. Thanks to Michael Weiss
+ <dev.prim...@gmail.com> for reporting and testing the fix.
+- update to version 196:
+ - Add a comment/annotation when the GNU_BUILD_ID field has been modified.
+ - Fix the "Black" version detection.
+ - Replace "token" with anonymous variable "x" in order to remove extra lines.
+
+-------------------------------------------------------------------
Old:
----
diffoscope-196.tar.bz2
diffoscope-196.tar.bz2.asc
New:
----
diffoscope-197.tar.bz2
diffoscope-197.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffoscope.spec ++++++
--- /var/tmp/diff_new_pack.r82IPq/_old 2021-12-24 20:23:43.166036375 +0100
+++ /var/tmp/diff_new_pack.r82IPq/_new 2021-12-24 20:23:43.166036375 +0100
@@ -17,7 +17,7 @@
Name: diffoscope
-Version: 196
+Version: 197
Release: 0
Summary: In-depth comparison of files, archives, and directories
License: GPL-3.0-or-later
++++++ diffoscope-196.tar.bz2 -> diffoscope-197.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/debian/changelog
new/diffoscope-197/debian/changelog
--- old/diffoscope-196/debian/changelog 2021-12-10 17:05:13.000000000 +0100
+++ new/diffoscope-197/debian/changelog 2021-12-17 10:56:06.000000000 +0100
@@ -1,3 +1,15 @@
+diffoscope (197) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Drop unnecessary has_same_content_as logging calls.
+
+ [ Mattia Rizzolo ]
+ * Ignore the new "binary-with-bad-dynamic-table" Lintian tag.
+ * Support pgpdump 0.34 in the tests. Thanks to Michael Weiss
+ <dev.prim...@gmail.com> for reporting and testing the fix.
+
+ -- Chris Lamb <la...@debian.org> Fri, 17 Dec 2021 09:56:04 +0000
+
diffoscope (196) unstable; urgency=medium
[ Roland Clobus ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/debian/control
new/diffoscope-197/debian/control
--- old/diffoscope-196/debian/control 2021-12-10 17:05:13.000000000 +0100
+++ new/diffoscope-197/debian/control 2021-12-17 10:56:06.000000000 +0100
@@ -136,7 +136,7 @@
${diffoscope:Recommends},
${python3:Recommends},
Enhances:
- diffoscope-core,
+ diffoscope-minimal,
Description: in-depth visual diff tool for files, archives and directories
diffoscope is a visual diff tool that attempts try to get to the bottom of
what makes files or directories actually different.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/debian/source/lintian-overrides
new/diffoscope-197/debian/source/lintian-overrides
--- old/diffoscope-196/debian/source/lintian-overrides 2021-12-10
17:05:13.000000000 +0100
+++ new/diffoscope-197/debian/source/lintian-overrides 2021-12-17
10:56:06.000000000 +0100
@@ -8,6 +8,10 @@
# We are upstream but also quite integrated in Debian.
upstream-metadata-in-native-source
+# tests are special
+binary-with-bad-dynamic-table [tests/data/test1.debug]
+binary-with-bad-dynamic-table [tests/data/test2.debug]
+
# we are fully aware of this
# https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/66
source-is-missing tests/data/test1.debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/diffoscope/__init__.py
new/diffoscope-197/diffoscope/__init__.py
--- old/diffoscope-196/diffoscope/__init__.py 2021-12-10 17:05:13.000000000
+0100
+++ new/diffoscope-197/diffoscope/__init__.py 2021-12-17 10:56:06.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 = "196"
+VERSION = "197"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/diffoscope/comparators/decompile.py
new/diffoscope-197/diffoscope/comparators/decompile.py
--- old/diffoscope-196/diffoscope/comparators/decompile.py 2021-12-10
17:05:13.000000000 +0100
+++ new/diffoscope-197/diffoscope/comparators/decompile.py 2021-12-17
10:56:06.000000000 +0100
@@ -201,7 +201,6 @@
return self._fuzzy_hash
def has_same_content_as(self, other):
- logger.debug("has_same_content: %s %s", self, other)
try:
return self.hex_dump == other.hex_dump
except AttributeError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/diffoscope/comparators/device.py
new/diffoscope-197/diffoscope/comparators/device.py
--- old/diffoscope-196/diffoscope/comparators/device.py 2021-12-10
17:05:13.000000000 +0100
+++ new/diffoscope-197/diffoscope/comparators/device.py 2021-12-17
10:56:06.000000000 +0100
@@ -43,7 +43,6 @@
return st.st_mode, os.major(st.st_rdev), os.minor(st.st_rdev)
def has_same_content_as(self, other):
- logger.debug("has_same_content: %s %s", self, other)
try:
return self.get_device() == other.get_device()
except (AttributeError, OSError):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-196/tests/comparators/test_pgp.py
new/diffoscope-197/tests/comparators/test_pgp.py
--- old/diffoscope-196/tests/comparators/test_pgp.py 2021-12-10
17:05:13.000000000 +0100
+++ new/diffoscope-197/tests/comparators/test_pgp.py 2021-12-17
10:56:06.000000000 +0100
@@ -16,12 +16,15 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
+import re
import pytest
+import subprocess
from diffoscope.comparators.pgp import PgpFile, PgpSignature
-from ..utils.data import load_fixture, assert_diff
+from ..utils.data import load_fixture, assert_diff, get_data
from ..utils.tools import skip_unless_tools_exist
+from ..utils.versions import Version
from ..utils.nonexisting import assert_non_existing
pgp1 = load_fixture("test1.pgp")
@@ -41,6 +44,18 @@
assert difference is None
+def pgpdump_version():
+ out = subprocess.check_output(
+ ("pgpdump", "-v"), stderr=subprocess.STDOUT
+ ).decode("utf-8")
+ # pgpdump version 0.33, Copyright (C) 1998-2017 Kazu Yamamoto
+ m = re.search(r"^pgpdump version (?P<version>\d+\.\d+)", out)
+ if m is None:
+ raise ValueError(f"Error parsing `pgpdump -v` output: {out}")
+
+ return Version(m.group("version"))
+
+
@pytest.fixture
def differences(pgp1, pgp2):
return pgp1.compare(pgp2).details
@@ -81,4 +96,12 @@
@skip_unless_tools_exist("pgpdump")
def test_signed_diff(signed_differences):
- assert_diff(signed_differences[0], "pgp_signed_expected_diff")
+ expected_diff = get_data("pgp_signed_expected_diff")
+ if pgpdump_version() > Version(0.33):
+ expected_diff = expected_diff.replace(
+ "Format - binary", "Packet data format - binary"
+ )
+ expected_diff = expected_diff.replace(
+ "File modified time", "Creation time"
+ )
+ assert signed_differences[0].unified_diff == expected_diff
