[blivet:master 3/6] Eliminate dirtyCB parameter from mountExistingSystem() params.

mulhern amulhern at redhat.com
Wed Dec 17 14:33:45 UTC 2014


It was introduced in anaconda commit
fa872e7e35d88008c5f9c83998d530cdd2738be8 (2012 Feb)
with the intention of using it in the method invocation in anaconda.
The invocation has been updated multiple times, but the CBs have
never been added and the TODO has gone away.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/__init__.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index 4977790..63d6f9c 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -2050,13 +2050,9 @@ class Blivet(object):
 
         self.fsset.setFstabSwaps(devices)
 
-def mountExistingSystem(fsset, rootDevice,
-                        allowDirty=False, dirtyCB=None,
-                        readOnly=None):
+def mountExistingSystem(fsset, rootDevice, allowDirty=False, readOnly=None):
     """ Mount filesystems specified in rootDevice's /etc/fstab file. """
     rootPath = _sysroot
-    if dirtyCB is None:
-        dirtyCB = lambda l: False
 
     if readOnly:
         readOnly = "ro"
@@ -2093,7 +2089,7 @@ def mountExistingSystem(fsset, rootDevice,
                                                           device.format.type)
             dirtyDevs.append(device.path)
 
-    if dirtyDevs and (not allowDirty or dirtyCB(dirtyDevs)):
+    if dirtyDevs and not allowDirty:
         raise DirtyFSError(dirtyDevs)
 
     fsset.mountFilesystems(rootPath=_sysroot, readOnly=readOnly, skipRoot=True)
-- 
1.9.3



More information about the anaconda-patches mailing list