[anaconda:rhel7/master 2/8] Add sanityCheck functionality back into AutoPart.execute() (#1060255)

mulhern amulhern at redhat.com
Mon Feb 10 15:28:34 UTC 2014


Related: rhbz#1060255

Since doAutoPartition no longer calls blivet.sanityCheck() need to add in
the call explicitly using partitioning.sanityCheck() in order to get the
correct exception thrown.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 pyanaconda/kickstart.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 36d0710..b8cebad 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -238,6 +238,7 @@ class Authconfig(commands.authconfig.FC3_Authconfig):
 class AutoPart(commands.autopart.F20_AutoPart):
     def execute(self, storage, ksdata, instClass):
         from blivet.partitioning import doAutoPartition
+        from blivet.partitioning import sanityCheck
 
         if not self.autopart:
             return
@@ -258,6 +259,7 @@ class AutoPart(commands.autopart.F20_AutoPart):
             storage.autoPartType = self.type
 
         doAutoPartition(storage, ksdata)
+        sanityCheck(storage)
 
 class Bootloader(commands.bootloader.F19_Bootloader):
     def __init__(self, *args, **kwargs):
-- 
1.8.3.1



More information about the anaconda-patches mailing list