[Git][reproducible-builds/diffoscope][master] Don't cause a traceback if cbfstool extraction failed. (Re: #398)

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
e2c21172 by Chris Lamb at 2025-01-21T11:48:02+00:00
Don't cause a traceback if cbfstool extraction failed. (Re: #398)

- - - - -


1 changed file:

- diffoscope/comparators/cbfs.py


Changes:

=====================================
diffoscope/comparators/cbfs.py
=====================================
@@ -87,7 +87,11 @@ class CbfsContainer(Archive):
             dest_path,
         ]
         logger.debug("cbfstool extract %s to %s", member_name, dest_path)
-        our_check_output(cmd, stderr=subprocess.DEVNULL)
+        try:
+            our_check_output(cmd, stderr=subprocess.DEVNULL)
+        except subprocess.CalledProcessError:
+            logger.error("unable to extract %s", member_name)
+            return None
         return dest_path
 
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/e2c211724f8d3865e20aed025a18b5a1ae7b95ce

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/e2c211724f8d3865e20aed025a18b5a1ae7b95ce
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/20250121/ecd8ceba/attachment.htm>