[master 6/6] Minor cleanup of blivet.formats.fs.BTRFS._preSetup.

dwlehman installerbot-noreply at redhat.com
Tue Aug 4 18:29:51 UTC 2015


From: David Lehman <dlehman at redhat.com>

Fix return type and improve logging of method call.
---
 blivet/formats/fs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 0017b88..431ce53 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -902,10 +902,10 @@ def destroy(self, **kwargs):
 
     def _preSetup(self, **kwargs):
         log_method_call(self, type=self.mountType, device=self.device,
-                        mountpoint=self.mountpoint)
+                        mountpoint=self.mountpoint or kwargs.get("mountpoint"))
         # Since btrfs vols have subvols the format setup is automatic.
         # Don't try to mount it if there's no mountpoint.
-        return self.mountpoint or kwargs.get("mountpoint")
+        return bool(self.mountpoint or kwargs.get("mountpoint"))
 
 register_device_format(BTRFS)
 


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


More information about the anaconda-patches mailing list