refactor password assignment logic

borgmatic/actions/restore.py

@@ -72,7 +72,7 @@ def restore_single_database(
 ):  # pragma: no cover
     '''
     Given (among other things) an archive name, a database hook name, the hostname,
-    port, username and password as connection params,  and a configured database
+    port, username and password as connection params, and a configured database
     configuration dict, restore that database from the archive.
     '''
     logger.info(

borgmatic/hooks/postgresql.py

@@ -30,7 +30,10 @@ def make_extra_environment(database, restore_connection_params=None):
     extra = dict()
 
     try:
-        extra['PGPASSWORD'] = restore_connection_params.get('password') or database['restore_password'] or database['password']
+        if restore_connection_params:
+            extra['PGPASSWORD'] = restore_connection_params.get('password') or database.get('restore_password', database['password'])
+        else:
+            extra['PGPASSWORD'] = database['password']
     except (AttributeError, KeyError):
         pass