From 827cb952d126d6638c6c029ef8f42990ddb21916 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 19 Jan 2015 00:43:06 -0400 Subject: [PATCH] Show clearer message when a GPG initialization problem occurs --- mayan/apps/django_gpg/api.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mayan/apps/django_gpg/api.py b/mayan/apps/django_gpg/api.py index e038f2ee9d..6c0e9f0477 100644 --- a/mayan/apps/django_gpg/api.py +++ b/mayan/apps/django_gpg/api.py @@ -2,6 +2,7 @@ from __future__ import absolute_import import logging import os +import sys import tempfile try: @@ -14,9 +15,11 @@ import gnupg from django.utils.translation import ugettext_lazy as _ -from .exceptions import (GPGVerificationError, GPGSigningError, - GPGDecryptionError, KeyDeleteError, KeyGenerationError, - KeyFetchingError, KeyDoesNotExist, KeyImportError) +from .exceptions import ( + GPGException, GPGVerificationError, GPGSigningError, GPGDecryptionError, + KeyDeleteError, KeyGenerationError, KeyFetchingError, KeyDoesNotExist, + KeyImportError +) from .literals import KEY_TYPES logger = logging.getLogger(__name__) @@ -123,7 +126,10 @@ class GPG(object): self.keyservers = keyservers - self.gpg = gnupg.GPG(**kwargs) + try: + self.gpg = gnupg.GPG(**kwargs) + except Exception as exception: + raise GPGException(u'ERROR: GPG initialization error; %s' % exception) def verify_file(self, file_input, detached_signature=None, fetch_key=False): """