From f0c29147dd65c5f819f3ade4e5238549cc9c0fe4 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Mon, 28 Nov 2016 14:42:42 +0100 Subject: [PATCH] [mod] style --- src/yunohost/certificate.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index fb982980b..f8a927e08 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -201,7 +201,9 @@ def _certificate_install_selfsigned(domain_list, force=False): for command in commands: p = subprocess.Popen( command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + out, _ = p.communicate() + if p.returncode != 0: logger.warning(out) raise MoulinetteError( @@ -532,8 +534,10 @@ def _fetch_and_enable_new_certificate(domain, staging=False): logger.error(str(e)) raise MoulinetteError(errno.EINVAL, m18n.n( 'certmanager_cert_signing_failed')) + except Exception as e: logger.error(str(e)) + raise MoulinetteError(errno.EINVAL, m18n.n( 'certmanager_cert_signing_failed')) @@ -552,6 +556,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False): new_cert_folder = "%s/%s-history/%s-%s" % ( CERT_FOLDER, domain, date_tag, folder_flag) + os.makedirs(new_cert_folder) _set_permissions(new_cert_folder, "root", "root", 0655)