[master 1/2] Drop self.status from _preSetup and add kwargs to unmount

bcl installerbot-noreply at redhat.com
Tue Apr 14 00:44:31 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

A couple things missed in the merge.
---
 blivet/formats/fs.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 5f25eb9..0f302b3 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -632,7 +632,7 @@ def _preSetup(self, **kwargs):
         if not isinstance(self, NoDevFS) and not os.path.exists(self.device):
             raise FSError("device %s does not exist" % self.device)
 
-        return not self.status
+        return True
 
     def _setup(self, **kwargs):
         """ Mount this filesystem.
@@ -901,7 +901,7 @@ def mount(self, **kwargs):
         """
         return self.setup(**kwargs)
 
-    def unmount(self):
+    def unmount(self, **kwargs):
         """ Unmount this filesystem.
 
             :param str mountpoint: Optional mountpoint to be unmounted.
@@ -911,7 +911,7 @@ def unmount(self):
             by the system. Override this behavior by passing a specific mountpoint. FSError
             will be raised in either case if the path doesn't exist.
         """
-        return self.teardown()
+        return self.teardown(**kwargs)
 
     @property
     def status(self):


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


More information about the anaconda-patches mailing list