Merge branch 'master' of git.shore.co.il:nimrod/rcfiles

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
         args: ["--filter-files", "--profile", "black"]
 
   - repo: https://github.com/ambv/black
-    rev: 21.8b0
+    rev: 22.6.0
     hooks:
       - id: black
         exclude: &excluded_pythonscripts pythonrc.py|rabbitmqadmin

Documents/bin/download-password-db

@@ -18,6 +18,18 @@ DEST = os.path.expanduser(f"~/{ os.path.dirname(DB_PATH) }")
 SOURCE = f"nextcloud:{DB_PATH}"
 
 
+def close_passhole():
+    """Try to close passhole. Ignore all failures including no open database
+    and failed import (to avoid dependency on passhole)."""
+    try:
+        # pylint: disable=import-outside-toplevel
+        from pykeepass_cache.pykeepass_cache import close
+
+        close()
+    except (ImportError, OSError):
+        pass
+
+
 if __name__ == "__main__":
     username = input(f"Enter username (defaults to {getpass.getuser()}): ")
     if not username:
@@ -31,6 +43,7 @@ if __name__ == "__main__":
         check=True,
         text=True,
     ).stdout.strip()
+    close_passhole()
     os.execvp(  # nosec
         "rclone",
         [