diff options
| -rw-r--r-- | buildstream/_fuse/mount.py | 11 | ||||
| -rw-r--r-- | buildstream/sandbox/_mounter.py | 25 |
2 files changed, 19 insertions, 17 deletions
diff --git a/buildstream/_fuse/mount.py b/buildstream/_fuse/mount.py index 8220a8d07..3848ad305 100644 --- a/buildstream/_fuse/mount.py +++ b/buildstream/_fuse/mount.py @@ -143,12 +143,11 @@ class Mount(): @contextmanager def mounted(self, mountpoint): - def kill_proc(): - self.unmount() - - with _signals.terminator(kill_proc): - self.mount(mountpoint) - yield + self.mount(mountpoint) + try: + with _signals.terminator(self.unmount): + yield + finally: self.unmount() ################################################ diff --git a/buildstream/sandbox/_mounter.py b/buildstream/sandbox/_mounter.py index 3f8299392..c039b31df 100644 --- a/buildstream/sandbox/_mounter.py +++ b/buildstream/sandbox/_mounter.py @@ -98,10 +98,12 @@ class Mounter(object): options = ','.join([key for key, val in kwargs.items() if val]) - with _signals.terminator(kill_proc): - yield cls._mount(dest, src, mount_type, stdout=stdout, stderr=stderr, options=options) - - cls._umount(dest, stdout, stderr) + path = cls._mount(dest, src, mount_type, stdout=stdout, stderr=stderr, options=options) + try: + with _signals.terminator(kill_proc): + yield path + finally: + cls._umount(dest, stdout, stderr) # bind_mount() # @@ -136,10 +138,11 @@ class Mounter(object): path = cls._mount(dest, src, None, stdout, stderr, options) - with _signals.terminator(kill_proc): - # Make the rbind a slave to avoid unmounting vital devices in - # /proc - cls._mount(dest, flags=['--make-rslave']) - yield path - - cls._umount(dest, stdout, stderr) + try: + with _signals.terminator(kill_proc): + # Make the rbind a slave to avoid unmounting vital devices in + # /proc + cls._mount(dest, flags=['--make-rslave']) + yield path + finally: + cls._umount(dest, stdout, stderr) |