summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-01-21 09:49:03 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-01-21 09:49:03 +0100
commit37f9a2ad2a16b4001a87747d012777fb3dbd999c (patch)
tree97b299b085b559c3d6e8ac06af5488d82f0dfd5d
parentc17189e8d25bafaeb4a16c1678257c1e6502cea2 (diff)
parent4d92fc6f77f8d7b0cc9c2acd527fa50b58a8b216 (diff)
downloadqutebrowser-37f9a2ad2a16b4001a87747d012777fb3dbd999c.tar.gz
qutebrowser-37f9a2ad2a16b4001a87747d012777fb3dbd999c.zip
Merge remote-tracking branch 'origin/pr/5199'
-rwxr-xr-xmisc/userscripts/qute-pass4
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index a22cd7187..fbaa3c285 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -105,7 +105,7 @@ def find_pass_candidates(domain, password_store_path):
continue
# Strip password store path prefix to get the relative pass path
- pass_path = path[len(password_store_path) + 1:]
+ pass_path = path[len(password_store_path):]
split_path = pass_path.split(os.path.sep)
for secret in secrets:
secret_base = os.path.splitext(secret)[0]
@@ -152,6 +152,8 @@ def main(arguments):
# Expand potential ~ in paths, since this script won't be called from a shell that does it for us
password_store_path = os.path.expanduser(arguments.password_store)
+ # Add trailing slash if not present
+ password_store_path = os.path.join(password_store_path, '')
# Try to find candidates using targets in the following order: fully-qualified domain name (includes subdomains),
# the registered domain name, the IPv4 address if that's what the URL represents and finally the private domain