[master 25/30] Do not call _getFSInfo() in minsize and size methods.

mulkieran installerbot-noreply at redhat.com
Tue Apr 14 15:32:42 UTC 2015


From: mulhern <amulhern at redhat.com>

Related: #12

The only place these methods were called, _getFSInfo has just been
called. Also, it makes dealing with these methods a bit more awkward in task
framework.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/formats/fs.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index f6c7706..e318701 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -321,9 +321,6 @@ def _getExistingSize(self, info=None):
 
         size = Size(0)
         if self.exists:
-            if info is None:
-                info = self._getFSInfo()
-
             try:
                 values = []
                 for line in info.splitlines():
@@ -871,10 +868,6 @@ def _getMinSize(self, info=None):
         blockSize = None
 
         if self.exists and os.path.exists(self.device):
-            if info is None:
-                # get block size
-                info = self._getFSInfo()
-
             for line in info.splitlines():
                 if line.startswith("Block size:"):
                     blockSize = int(line.split(" ")[-1])


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


More information about the anaconda-patches mailing list