Get rid of obnamlib.Error

1 files changed, 12 insertions, 2 deletions

diff --git a/obnamlib/encryption.py b/obnamlib/encryption.py
index 1d7643bc..527c71af 100644
--- a/obnamlib/encryption.py
+++ b/obnamlib/encryption.py
@@ -23,6 +23,16 @@ import tracing
 import obnamlib
 
 
+class EncryptionError(obnamlib.ObnamError):
+
+    pass
+
+
+class GpgError(EncryptionError):
+
+    msg = 'gpg failed with exit code {returncode}:\n{stderr}'
+
+
 def generate_symmetric_key(numbits, filename='/dev/random'):
     '''Generate a random key of at least numbits for symmetric encryption.'''
 
@@ -93,7 +103,7 @@ def _gpg_pipe(args, data, passphrase):
 
     # Return output data, or deal with errors.
     if p.returncode: # pragma: no cover
-        raise obnamlib.EncryptionError(err)
+        raise GpgError(returncode=p.returncode, stderr=err)
 
     return out
 
@@ -125,7 +135,7 @@ def _gpg(args, stdin='', gpghome=None):
 
     # Return output data, or deal with errors.
     if p.returncode: # pragma: no cover
-        raise obnamlib.EncryptionError(err)
+        raise GpgError(returncode=p.returncode, stderr=err)
 
     return out