[master 3/4] Factor creating task objects into a separate method.
mulkieran
installerbot-noreply at redhat.com
Wed Jun 24 17:08:01 UTC 2015
From: mulhern <amulhern at redhat.com>
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/formats/fs.py | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index e2c5ef3..79bb68c 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -100,19 +100,7 @@ def __init__(self, **kwargs):
DeviceFormat.__init__(self, **kwargs)
- # Create task objects
- self._info = self._infoClass(self)
- self._fsck = self._fsckClass(self)
- self._mkfs = self._mkfsClass(self)
- self._mount = self._mountClass(self)
- self._readlabel = self._readlabelClass(self)
- self._resize = self._resizeClass(self)
- self._sync = self._syncClass(self)
- self._writelabel = self._writelabelClass(self)
-
- # These two may depend on info class, so create them after
- self._minsize = self._minsizeClass(self)
- self._sizeinfo = self._sizeinfoClass(self)
+ self._createTaskObjects()
self._current_info = None # info obtained by _info task
@@ -143,6 +131,22 @@ def __init__(self, **kwargs):
if self.supported:
self.loadModule()
+ def _createTaskObjects(self):
+ """ Create task objects belonging to this master object. """
+ # pylint: disable=attribute-defined-outside-init
+ self._info = self._infoClass(self)
+ self._fsck = self._fsckClass(self)
+ self._mkfs = self._mkfsClass(self)
+ self._mount = self._mountClass(self)
+ self._readlabel = self._readlabelClass(self)
+ self._resize = self._resizeClass(self)
+ self._sync = self._syncClass(self)
+ self._writelabel = self._writelabelClass(self)
+
+ # These two may depend on info class, so create them after
+ self._minsize = self._minsizeClass(self)
+ self._sizeinfo = self._sizeinfoClass(self)
+
def __repr__(self):
s = DeviceFormat.__repr__(self)
s += (" mountpoint = %(mountpoint)s mountopts = %(mountopts)s\n"
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/6fcb922084b82f55accd777ddb0f3fe90d00ebd5
More information about the anaconda-patches
mailing list