[blivet:master 04/17] Simplify FS._getOptions().

mulhern amulhern at redhat.com
Tue Jan 6 20:38:06 UTC 2015


Get rid of the XXX as well. clobbering has become traditional.

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

diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 07a383a..0c610cb 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -832,11 +832,7 @@ class FS(DeviceFormat):
         return self._defaultCheckOptions[:]
 
     def _getOptions(self):
-        options = ",".join(self.defaultMountOptions)
-        if self.mountopts:
-            # XXX should we clobber or append?
-            options = self.mountopts
-        return options
+        return self.mountopts or ",".join(self.defaultMountOptions)
 
     def _setOptions(self, options):
         self.mountopts = options
-- 
1.9.3



More information about the anaconda-patches mailing list