Catch macOS Keychain permission error. Fixes #49

src/vorta/borg/borg_thread.py

@@ -45,6 +45,8 @@ class BorgThread(QtCore.QThread, BackupProfileMixin):
         password = params.get('password')
         if password is not None:
             env['BORG_PASSPHRASE'] = password
+        else:
+            env['BORG_PASSPHRASE'] = '9999999'  # Set dummy password to avoid prompt.
 
         env['BORG_RSH'] = 'ssh -oStrictHostKeyChecking=no'
         ssh_key = params.get('ssh_key')
@@ -93,11 +95,18 @@ class BorgThread(QtCore.QThread, BackupProfileMixin):
             ret['message'] = 'Add a backup repository first.'
             return ret
 
+        # Try to get password from chosen keyring backend.
+        try:
+            ret['password'] = keyring.get_password("vorta-repo", profile.repo.url)
+        except keyring.backends._OS_X_API.Error:
+            ret['message'] = 'Please make sure you grant Vorta permission to use the Keychain.'
+            return ret
+
         ret['ssh_key'] = profile.ssh_key
         ret['repo_id'] = profile.repo.id
         ret['repo_url'] = profile.repo.url
         ret['profile_name'] = profile.name
-        ret['password'] = keyring.get_password("vorta-repo", profile.repo.url)  # None if no password.
+
         ret['ok'] = True
 
         return ret

src/vorta/borg/create.py

@@ -32,6 +32,8 @@ class BorgCreateThread(BorgThread):
                 repo.total_unique_chunks = stats['total_unique_chunks']
                 repo.save()
 
+            self.app.backup_log_event.emit('Backup finished.')
+
     def log_event(self, msg):
         self.app.backup_log_event.emit(msg)
 
@@ -41,7 +43,6 @@ class BorgCreateThread(BorgThread):
 
     def finished_event(self, result):
         self.app.backup_finished_event.emit(result)
-        self.app.backup_log_event.emit('Backup finished.')
 
     @classmethod
     def prepare(cls, profile):