Volans has submitted this change and it was merged.
Change subject: keyholder: fix flake8
......................................................................
keyholder: fix flake8
Bug: T148273
Change-Id: I51b332d2cfe9925807b7bcd97b40e1f95290ee3b
---
M modules/keyholder/files/ssh-agent-proxy
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/keyholder/files/ssh-agent-proxy
b/modules/keyholder/files/ssh-agent-proxy
index 2bbf4ff..3c129ee 100644
--- a/modules/keyholder/files/ssh-agent-proxy
+++ b/modules/keyholder/files/ssh-agent-proxy
@@ -93,13 +93,14 @@
"""Look up the key fingerprints for all keys held by keyholder"""
keymap = {}
for fname in glob.glob('/etc/keyholder.d/*.pub'):
- line = subprocess.check_output(['/usr/bin/ssh-keygen', '-lf', fname],
- universal_newlines=True)
+ line = subprocess.check_output(
+ ['/usr/bin/ssh-keygen', '-lf', fname], universal_newlines=True)
bits, fingerprint, note = line.split(' ', 2)
keyfile = os.path.splitext(os.path.basename(fname))[0]
keymap[keyfile] = fingerprint.replace(':', '')
return keymap
+
def get_key_perms(path):
"""Recursively walk `path`, loading YAML configuration files."""
key_perms = {}
--
To view, visit https://gerrit.wikimedia.org/r/318942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51b332d2cfe9925807b7bcd97b40e1f95290ee3b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
