[Git][reproducible-builds/diffoscope][master] 3 commits: Catch CalledProcessError when calling html2text.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
e470ee25 by Chris Lamb at 2025-02-21T12:35:03+00:00
Catch CalledProcessError when calling html2text.

- - - - -
e24de2ca by Chris Lamb at 2025-02-21T12:39:26+00:00
Update copyright years.

- - - - -
ea862d1f by Chris Lamb at 2025-02-21T12:40:01+00:00
releasing package diffoscope version 289

- - - - -


3 changed files:

- debian/changelog
- diffoscope/__init__.py
- diffoscope/comparators/html.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-diffoscope (289) UNRELEASED; urgency=medium
+diffoscope (289) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Chris Lamb ]
+  * Catch CalledProcessError when calling html2text.
+  * Update copyright years.
 
- -- Chris Lamb <lamby at debian.org>  Fri, 07 Feb 2025 10:14:52 +0000
+ -- Chris Lamb <lamby at debian.org>  Fri, 21 Feb 2025 12:39:56 +0000
 
 diffoscope (288) unstable; urgency=medium
 


=====================================
diffoscope/__init__.py
=====================================
@@ -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 = "288"
+VERSION = "289"


=====================================
diffoscope/comparators/html.py
=====================================
@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2022 Chris Lamb <lamby at debian.org>
+# Copyright © 2022, 2025 Chris Lamb <lamby at 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
@@ -17,6 +17,7 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import re
+import subprocess
 
 from diffoscope.difference import Difference
 from diffoscope.exc import RequiredToolNotFound
@@ -49,5 +50,7 @@ class HtmlFile(TextFile):
                 difference.add_details([text])
         except RequiredToolNotFound as exc:  # noqa
             difference.add_comment(exc.get_comment())
+        except subprocess.CalledProcessError:
+            pass
 
         return difference



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/b8e3c6cbafed2103ce8d24539d8d2510eda6ac0e...ea862d1f846054793963e2e7210d25717955cd35

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/b8e3c6cbafed2103ce8d24539d8d2510eda6ac0e...ea862d1f846054793963e2e7210d25717955cd35
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20250221/0fbccfd1/attachment.htm>