summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-04-08 16:17:05 +0300
committerLars Wirzenius <liw@liw.fi>2020-04-08 16:17:05 +0300
commit27d4e3c5cc88a2e1fadb3008fb303fcea090f1d3 (patch)
tree1e29f2334e2bd94cc1ed162c364830521e3b8650
parente3c2c368d843c166b8f336ff301a2b13a2a88754 (diff)
downloadvmdb2-27d4e3c5cc88a2e1fadb3008fb303fcea090f1d3.tar.gz
Fix: runcmd_chroot to always unmount /proc
-rw-r--r--vmdb/runcmd.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/vmdb/runcmd.py b/vmdb/runcmd.py
index fa26f92..1ff374c 100644
--- a/vmdb/runcmd.py
+++ b/vmdb/runcmd.py
@@ -57,12 +57,12 @@ def runcmd_chroot(chroot, argv, *argvs, **kwargs):
_mount_proc(chroot)
try:
full_argv = ['chroot', chroot] + argv
- return runcmd(full_argv, *argvs, **kwargs)
+ ret = runcmd(full_argv, *argvs, **kwargs)
except Exception:
_unmount_proc(chroot)
raise
- finally:
- _unmount_proc(chroot)
+ _unmount_proc(chroot)
+ return ret
def _mount_proc(chroot):