X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=certmaster%2Futils.py;h=a470aad074859a54107da77ed1dc046a659bc4a4;hp=3dec6a54a283fc699d466da2723100137c297449;hb=2108f87ee704ac86f5a6b924c03afc86e0fa617d;hpb=613a485c4798b38a65042e9d78968896c590fdd0 diff --git a/certmaster/utils.py b/certmaster/utils.py index 3dec6a5..a470aad 100755 --- a/certmaster/utils.py +++ b/certmaster/utils.py @@ -151,7 +151,7 @@ def create_minion_keys(): csr = certs.make_csr(keypair, dest=csr_file) except Exception, e: traceback.print_exc() - raise codes.FuncException, "Could not create local keypair or csr for session" + raise codes.CMException, "Could not create local keypair or csr for session" result = False log = logger.Logger().logger @@ -161,7 +161,7 @@ def create_minion_keys(): log.debug("submitting CSR to certmaster %s" % master_uri) result, cert_string, ca_cert_string = submit_csr_to_master(csr_file, master_uri) except socket.gaierror, e: - raise codes.FuncException, "Could not locate certmaster at %s" % master_uri + raise codes.CMException, "Could not locate certmaster at %s" % master_uri # logging here would be nice if not result: