Merge lp:~jelmer/brz/gpg-warning into lp:brz

[Jelmer Vernooij]

Give a clearer warning when the gpg module is not available.

Give a clearer warning when the gpg module is not available.

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

=== modified file 'breezy/gpg.py'
--- breezy/gpg.py	2018-11-12 01:41:38 +0000
+++ breezy/gpg.py	2018-11-19 01:49:29 +0000
@@ -55,7 +55,8 @@
 
 class GpgNotInstalled(errors.DependencyNotPresent):
 
-    _fmt = 'python-gpg is not installed, it is needed to verify signatures'
+    _fmt = ('python-gpg is not installed, it is needed to create or '
+            'verify signatures. %(error)s')
 
     def __init__(self, error):
         errors.DependencyNotPresent.__init__(self, 'gpg', error)
@@ -230,7 +231,12 @@
             return False
 
     def sign(self, content, mode):
-        import gpg
+        try:
+            import gpg
+        except ImportError as error:
+            raise GpgNotInstalled(
+                'Set create_signatures=no to disable creating signatures.')
+
         if isinstance(content, text_type):
             raise errors.BzrBadParameterUnicode('content')
 
@@ -258,7 +264,8 @@
         try:
             import gpg
         except ImportError as error:
-            raise errors.GpgNotInstalled(error)
+            raise GpgNotInstalled(
+                'Set check_signatures=ignore to disable verifying signatures.')
 
         signed_data = gpg.Data(signed_data)
         if signature: