particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ObjectStore/get_tree: make sure to clean up the context manager

Browse source 
Even if the yield raises an exception, we must always unmount to
clean up.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-08-02 00:55:21 +02:00 • committed by Lars Karlitski
parent dcc9384ba8
commit 9371eb9eaa
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
osbuild/__init__.py
View file

@ -145,8 +145,10 @@ class ObjectStore:
with tempfile.TemporaryDirectory(dir=self.store) as tmp: with tempfile.TemporaryDirectory(dir=self.store) as tmp:
if tree_id: if tree_id:
subprocess.run(["mount", "-o", "bind,ro,mode=0755", f"{self.refs}/{tree_id}", tmp], check=True) subprocess.run(["mount", "-o", "bind,ro,mode=0755", f"{self.refs}/{tree_id}", tmp], check=True)
yield tmp try:
subprocess.run(["umount", "--lazy", tmp], check=True) yield tmp
finally:
subprocess.run(["umount", "--lazy", tmp], check=True)
else: else:
# None was given as tree_id, just return an empty directory # None was given as tree_id, just return an empty directory
yield tmp yield tmp