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

Chris Lamb (@lamby) gitlab at salsa.debian.org
Wed Jan 22 14:45:48 UTC 2025



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
00366fe7 by Chris Lamb at 2025-01-22T14:45:20+00:00
Revert "Don't cause a traceback if cbfstool extraction failed. (Re: #398)" - CalledProcessError is caught when calling .extract().

This reverts commit e2c211724f8d3865e20aed025a18b5a1ae7b95ce.

- - - - -


1 changed file:

- diffoscope/comparators/cbfs.py


Changes:

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



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/00366fe73ce31172c6fa70132156e1a03a2ba506
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/20250122/691fc07f/attachment.htm>


More information about the rb-commits mailing list