mount inside try block so problem mounting unmounts everything.

2 files changed, 6 insertions, 6 deletions

diff --git a/py/mock.py b/py/mock.py
index 08dd136..6b520f7 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -431,8 +431,8 @@ def main(ret):
 
     elif options.mode in ('chroot', 'shell'):
         chroot.tryLockBuildRoot()
-        chroot._mountall()
         try:
+            chroot._mountall()
             if config_opts['internal_setarch']:
                 mock.util.condPersonality(config_opts['target_arch'])
             cmd = ' '.join(args)
@@ -450,8 +450,8 @@ def main(ret):
         for hdr in mock.util.yieldSrpmHeaders(args, plainRpmOk=1):
             pass
         chroot.tryLockBuildRoot()
-        chroot._mountall()
         try:
+            chroot._mountall()
             chroot.installSrpmDeps(*args)
         finally:
             chroot._umountall()
diff --git a/py/mock/backend.py b/py/mock/backend.py
index 0576b1f..2484457 100644
--- a/py/mock/backend.py
+++ b/py/mock/backend.py
@@ -237,8 +237,8 @@ class Root(object):
 
         # yum stuff
         self.state("running yum")
-        self._mountall()
         try:
+            self._mountall()
             if not self.chrootWasCleaned:
                 self.chroot_setup_cmd = 'update'
             self._yum(self.chroot_setup_cmd, returnOutput=1)
@@ -300,8 +300,8 @@ class Root(object):
     def yumInstall(self, *srpms):
         """figure out deps from srpm. call yum to install them"""
         # pass build reqs (as strings) to installer
-        self._mountall()
         try:
+            self._mountall()
             self._yum('install %s' % ' '.join(srpms), returnOutput=1)
         finally:
             self._umountall()
@@ -349,9 +349,9 @@ class Root(object):
         # tell caching we are building
         self._callHooks('earlyprebuild')
 
-        self._mountall()
-        self.uidManager.becomeUser(self.chrootuid, self.chrootgid)
         try:
+            self._mountall()
+            self.uidManager.becomeUser(self.chrootuid, self.chrootgid)
             self.state("setup")
 
             srpmChrootFilename = self._copySrpmIntoChroot(srpm)