[anaconda][rhel7-branch/master][PATCH] Don't crash if escrow certificate is requested without network access (#1085265)

Martin Kolman mkolman at redhat.com
Fri Sep 26 14:36:43 UTC 2014

Turn the KickstartError to KickstartValueError. The KickstartValueError
is caught when the Storage spoke executes kickstart storage and user
can inspect the error in the Storage spoke info bar and fix it.

Also improve the error message a bit.

Resolves: rhbz#1085265
Signed-off-by: Martin Kolman <mkolman at redhat.com>
 pyanaconda/kickstart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7d25840..9f93ce9 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -153,8 +153,8 @@ def getEscrowCertificate(escrowCerts, url):
     needs_net = not url.startswith("/") and not url.startswith("file:")
     if needs_net and not nm.nm_is_connected():
-        msg = _("Escrow certificate %s requires the network.") % url
-        raise KickstartError(msg)
+        msg = _("Escrow certificate %s requires network access.") % url
+        raise KickstartValueError(msg)
     log.info("escrow: downloading %s", url)

More information about the anaconda-patches mailing list