Merge Lukas's changes to unlock if gpg fails

Conflicts:
	obnamlib/__init__.py

1 files changed, 8 insertions, 0 deletions

diff --git a/obnamlib/repo_interface.py b/obnamlib/repo_interface.py
index c618217a..361c33c9 100644
--- a/obnamlib/repo_interface.py
+++ b/obnamlib/repo_interface.py
@@ -394,22 +394,30 @@ class RepositoryInterface(object):
 
         '''
         unlockers = []
+        gpg_unlockers = []
         try:
             if not self.got_client_list_lock():
+                gpg_unlockers.append((self.unlock_client_list, []))
                 self.lock_client_list()
                 unlockers.append((self.unlock_client_list, []))
 
             for client_name in self.get_client_names():
                 if not self.got_client_lock(client_name):
+                    gpg_unlockers.append((self.unlock_client, [client_name]))
                     self.lock_client(client_name)
                     unlockers.append((self.unlock_client, [client_name]))
 
             if not self.got_chunk_indexes_lock():
+                gpg_unlockers.append((self.unlock_chunk_indexes, []))
                 self.lock_chunk_indexes()
         except obnamlib.LockFail:
             for unlocker, args in unlockers:
                 unlocker(*args)
             raise
+        except obnamlib.GpgError:
+            for unlocker, args in gpg_unlockers:
+                unlocker(*args)
+            raise
 
     def unlock_everything(self):
         '''Unock every part of the repository to which we hold a lock.