[Git][reproducible-builds/diffoscope][master] Dnn't raise exceptions when cleaning up after guestfs cleanup failure.

Chris Lamb gitlab at salsa.debian.org
Thu Sep 3 10:01:37 UTC 2020



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
aca42219 by Chris Lamb at 2020-09-03T10:58:25+01:00
Dnn't raise exceptions when cleaning up after guestfs cleanup failure.

- - - - -


1 changed file:

- diffoscope/comparators/fsimage.py


Changes:

=====================================
diffoscope/comparators/fsimage.py
=====================================
@@ -75,8 +75,12 @@ class FsImageContainer(Archive):
     def close_archive(self):
         if not guestfs:
             return None
-        self.g.umount_all()
-        self.g.close()
+
+        try:
+            self.g.umount_all()
+            self.g.close()
+        except Exception:  # noqa
+            pass
 
     def get_member_names(self):
         if not guestfs:



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/aca4221909b0b1244c5239b0f3087bdd176993a3
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/20200903/1fc1c34e/attachment.htm>


More information about the rb-commits mailing list