From c82dbc6bd33f0e58cefcb7438ac57852ab2dc3a0 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 4 Jul 2022 11:11:38 +0200
Subject: [PATCH] download-password-db: Close open passhole databases.
---
Documents/bin/download-password-db | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Documents/bin/download-password-db b/Documents/bin/download-password-db
index 04894cb..c1003ac 100755
--- a/Documents/bin/download-password-db
+++ b/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",
[
--
GitLab