--- diffoscope/comparators/deb.py | 2 +- diffoscope/comparators/debian.py | 14 +++++++------- tests/comparators/test_squashfs.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/diffoscope/comparators/deb.py b/diffoscope/comparators/deb.py index f6dd4f4..f5257b9 100644 --- a/diffoscope/comparators/deb.py +++ b/diffoscope/comparators/deb.py @@ -110,7 +110,7 @@ class Md5sumsFile(File): @needs_content def compare(self, other, source=None): if self.has_same_content_as(other): - return None + return None try: my_md5sums = Md5sumsFile.parse_md5sums(self.path) other_md5sums = Md5sumsFile.parse_md5sums(other.path) diff --git a/diffoscope/comparators/debian.py b/diffoscope/comparators/debian.py index 2b521dd..6f0e4e8 100644 --- a/diffoscope/comparators/debian.py +++ b/diffoscope/comparators/debian.py @@ -53,13 +53,13 @@ class DotChangesMember(File): @contextmanager def get_content(self): - if self._path is not None: - yield - else: - with self.container.source.get_content(): - self._path = os.path.join(os.path.dirname(self.container.source.path), self.name) - yield - self._path = None + if self._path is not None: + yield + else: + with self.container.source.get_content(): + self._path = os.path.join(os.path.dirname(self.container.source.path), self.name) + yield + self._path = None def is_directory(self): return False diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py index bc85b9a..efa58e0 100644 --- a/tests/comparators/test_squashfs.py +++ b/tests/comparators/test_squashfs.py @@ -47,9 +47,9 @@ def test_no_differences(squashfs1): assert difference is None def test_no_warnings(capfd, squashfs1, squashfs2): - _ = squashfs1.compare(squashfs2) - _, err = capfd.readouterr() - assert err == '' + _ = squashfs1.compare(squashfs2) + _, err = capfd.readouterr() + assert err == '' @pytest.fixture def differences(squashfs1, squashfs2): -- 2.5.0 _______________________________________________ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds