Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #24 and a typo found during that work #25

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix issue #24 and a typo found during that work #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4e947
Use (setq-local var value) to support older Emacs (such as 26.1 on Ce…
illumino Nov 27, 2021
7b3c308
Fix a typo spotted during last commit - ansuble -> ansible
illumino Nov 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions ansible-vault.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ generation.")
(defvar ansible-vault--header-version '()
"Buffer local variable for `ansible-vault-mode'.")

(defvar ansuble-vault--header-cipher-algorithm '()
(defvar ansible-vault--header-cipher-algorithm '()
"Buffer local variable for `ansible-vault-mode'.")

(defvar ansible-vault--header-vault-id '()
Expand Down Expand Up @@ -150,11 +150,10 @@ save hooks to treat ansible-vault file as encrypted on disk.")
(cipher-algorithm (caddr header-tokens))
(vault-id (cadddr header-tokens)))
(when (string= "$ANSIBLE_VAULT" format-id)
(setq-local
ansible-vault--header-format-id format-id
ansible-vault--header-version version
ansuble-vault--header-cipher-algorithm cipher-algorithm
ansible-vault--header-vault-id vault-id)))))
(setq-local ansible-vault--header-format-id format-id)
(setq-local ansible-vault--header-version version)
(setq-local ansible-vault--header-cipher-algorithm cipher-algorithm)
(setq-local ansible-vault--header-vault-id vault-id)))))

;;;###autoload
(defun ansible-vault--is-encrypted-vault-file ()
Expand Down Expand Up @@ -273,9 +272,8 @@ PASSWORD-FILE path to the stored secret for provided VAULT-ID."
(call-interactively 'ansible-vault--request-password))))
(car (push (cons vault-id password-file) ansible-vault-vault-id-alist)))))
(password-file (or password-file (cdr vault-id-pair))))
(setq-local
ansible-vault--vault-id vault-id
ansible-vault--password-file password-file)
(setq-local ansible-vault--vault-id vault-id)
(setq-local ansible-vault--password-file password-file)
vault-id-pair))

(defun ansible-vault--flush-password-file ()
Expand Down Expand Up @@ -333,9 +331,8 @@ its password file."
(ansible-config-path (ansible-vault--process-config-files)))
(cond
(vault-id-pair
(setq-local
ansible-vault--vault-id (car vault-id-pair)
ansible-vault--password-file (cdr vault-id-pair)))
(setq-local ansible-vault--vault-id (car vault-id-pair))
(setq-local ansible-vault--password-file (cdr vault-id-pair)))
(ansible-vault--header-vault-id
(ansible-vault--request-vault-id ansible-vault--header-vault-id))
(t (let* ((password-file
Expand Down Expand Up @@ -528,7 +525,7 @@ Ensures deletion of ansible-vault generated password files."
"Unset all buffer local variables."
(dolist (var '(ansible-vault--header-format-id
ansible-vault--header-version
ansuble-vault--header-cipher-algorithm
ansible-vault--header-cipher-algorithm
ansible-vault--header-vault-id
ansible-vault--point
ansible-vault--password-file
Expand Down