diff options
| author | Lars Wirzenius <liw@liw.fi> | 2015-08-29 20:20:57 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2015-08-29 20:20:57 +0300 |
| commit | 5ef4654c89983eba9ab9780fe54a550f52a1d2b1 (patch) | |
| tree | 03a66e6d4f3fec07033678cadea4d86492d4f5bf /obnamlib/__init__.py | |
| parent | e934763e8788a0aad50b2871b05bbf5182b89f81 (diff) | |
| parent | 83f034d85c6a787a9c8a7f755b14a97edfb6c32d (diff) | |
| download | obnam-5ef4654c89983eba9ab9780fe54a550f52a1d2b1.tar.gz | |
Merge Lukas's changes to unlock if gpg fails
Conflicts:
obnamlib/__init__.py
Diffstat (limited to 'obnamlib/__init__.py')
| -rw-r--r-- | obnamlib/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py index ff594e8d..06155441 100644 --- a/obnamlib/__init__.py +++ b/obnamlib/__init__.py @@ -90,7 +90,8 @@ from .encryption import ( encrypt_with_keyring, decrypt_with_secret_keys, SymmetricKeyCache, - EncryptionError) + EncryptionError, + GpgError) from .hooks import ( Hook, MissingFilterError, NoFilterTagError, FilterHook, HookManager) |