[f23-branch 1/1] Fix calling non-existing method (#1252902)

jkonecny12 installerbot-noreply at redhat.com
Thu Sep 24 09:37:14 UTC 2015


From: Jiri Konecny <jkonecny at redhat.com>

Fix my bug from commit (#05feef37e2c5ae8fd63abe2198ccd8d55e09b08a) where
I was calling non-existing device.format.umount() method, the unmount()
(missing 'n') method exists there but it's still only calling teardown()
instead of system umount. I'm changing call to util.umount() which
calling the system umount.
Because of this regression the first call of the
_findExistingInstallations method will raise an exception so no existing
installations were found and everything were in the Unknown group.
The exception was logged to storage log as info so I missed it.

Sorry guys for this issue.

Related: rhbz#1252902
---
 blivet/osinstall.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blivet/osinstall.py b/blivet/osinstall.py
index 707b146..affa870 100644
--- a/blivet/osinstall.py
+++ b/blivet/osinstall.py
@@ -239,11 +239,11 @@ def _findExistingInstallations(devicetree):
             device.format.mount(options=options, mountpoint=getSysroot())
         except Exception: # pylint: disable=broad-except
             log_exception_info(log.warning, "mount of %s as %s failed", [device.name, device.format.type])
-            device.format.umount(mountpoint=getSysroot())
+            util.umount(mountpoint=getSysroot())
             continue
 
         if not os.access(getSysroot() + "/etc/fstab", os.R_OK):
-            device.format.umount(mountpoint=getSysroot())
+            util.umount(mountpoint=getSysroot())
             device.teardown(recursive=True)
             continue
 
@@ -264,7 +264,7 @@ def _findExistingInstallations(devicetree):
                         {"product": product, "version": version, "arch": architecture}
 
         (mounts, swaps) = parseFSTab(devicetree, chroot=getSysroot())
-        device.format.umount(mountpoint=getSysroot())
+        util.umount(mountpoint=getSysroot())
         if not mounts and not swaps:
             # empty /etc/fstab. weird, but I've seen it happen.
             continue


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/03cec0d523710ca38d15a9b17f5825850833b1f3


More information about the anaconda-patches mailing list