[PATCH] Do not check LUKS devices for a passphrase in custom part (#1060255).

Chris Lumens clumens at redhat.com
Thu Feb 6 20:34:24 UTC 2014


If the user chooses to encrypt a filesystem, then we will prompt for a
passphrase after running the check.  Without the flag, that would cause an
error to be displayed before the user could have done anything about it.
---
 anaconda.spec.in                    | 2 +-
 pyanaconda/ui/gui/spokes/custom.py  | 2 +-
 pyanaconda/ui/gui/spokes/storage.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 49e74ba..216ae60 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -80,7 +80,7 @@ BuildRequires: s390utils-devel
 %endif
 
 Requires: anaconda-widgets = %{version}-%{release}
-Requires: python-blivet >= 0.18.19
+Requires: python-blivet >= 0.18.24
 Requires: gnome-icon-theme-symbolic
 Requires: python-meh >= %{mehver}
 Requires: libreport-anaconda >= 2.0.21-1
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index b2fdc9b..7d3d1a2 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1962,7 +1962,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             StorageChecker.errors = str(e).split("\n")
             self.data.bootloader.bootDrive = ""
 
-        StorageChecker.checkStorage(self)
+        StorageChecker.checkStorage(self, skipKeys=True)
 
         if self.errors:
             self.set_warning(_("Error checking storage configuration.  Click for details or press Done again to continue."))
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index f14a681..91b843b 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -225,13 +225,13 @@ class StorageChecker(object):
         threadMgr.add(AnacondaThread(name=constants.THREAD_CHECK_STORAGE,
                                      target=self.checkStorage))
 
-    def checkStorage(self):
+    def checkStorage(self, skipKeys=False):
         threadMgr.wait(constants.THREAD_EXECUTE_STORAGE)
 
         hubQ.send_not_ready(self._mainSpokeClass)
         hubQ.send_message(self._mainSpokeClass, _("Checking storage configuration..."))
         (StorageChecker.errors,
-         StorageChecker.warnings) = self.storage.sanityCheck()
+         StorageChecker.warnings) = self.storage.sanityCheck(skipKeys=skipKeys)
         hubQ.send_ready(self._mainSpokeClass, True)
         for e in StorageChecker.errors:
             log.error(e)
-- 
1.8.3.1



More information about the anaconda-patches mailing list