[master 1/3] Changes to FS._setTargetSize().

mulkieran installerbot-noreply at redhat.com
Tue Jun 16 13:55:20 UTC 2015


From: mulhern <amulhern at redhat.com>

Related: #56

* Eliminate some dead code. The "if newsize is None" block has been
dead since commit 910ff446cd4881610b9fab46a37e8f63b1f468fe (2013 Sep),
and it hasn't been missed. I think that _targetSize field is now often
set in such complicated ways that setting back to _size is no longer
a very useful behavior.

* Acknowledge the possibility that the maxSize may be 0, when checking
bounds. For some filesystems, this is the case.

* Extend docstring.

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

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index ce87d89..215bd47 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -197,7 +197,10 @@ def labelFormatOK(self, label):
        doc="this filesystem's label")
 
     def _setTargetSize(self, newsize):
-        """ Set a target size for this filesystem. """
+        """ Set the target size for this filesystem.
+
+            :param :class:`~.size.Size` newsize: the newsize
+        """
         if not isinstance(newsize, Size):
             raise ValueError("new size must be of type Size")
 
@@ -207,13 +210,11 @@ def _setTargetSize(self, newsize):
         if not self.resizable:
             raise FSError("filesystem is not resizable")
 
-        if newsize is None:
-            # unset any outstanding resize request
-            self._targetSize = self._size
-            return
+        if newsize < self.minSize:
+            raise ValueError("requested size %s must be at least minimum size %s" % (newsize, self.minSize))
 
-        if not self.minSize <= newsize < self.maxSize:
-            raise ValueError("requested size %s must fall between minimum size %s and maximum size %s" % (newsize, self.minSize, self.maxSize))
+        if self.maxSize and newsize >= self.maxSize:
+            raise ValueError("requested size %s must be less than maximum size %s" % (newsize, self.maxSize))
 
         self._targetSize = newsize
 


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


More information about the anaconda-patches mailing list