Skip to content

Commit

Permalink
Changes to FS._setTargetSize().
Browse files Browse the repository at this point in the history
Related: #56

* Eliminate some dead code. The "if newsize is None" block has been
dead since commit 910ff44 (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@redhat.com>
  • Loading branch information
mulkieran committed Jun 16, 2015
1 parent 6ca39b9 commit fb40db0
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions blivet/formats/fs.py
Expand Up @@ -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")

Expand All @@ -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

Expand Down

0 comments on commit fb40db0

Please sign in to comment.