diff options
| author |   Clemens Hammacher <hammacher@cs.uni-saarland.de> | 2010-09-10 15:43:35 +0200 |
|---|---|---|
| committer |   Robin H. Johnson <robbat2@gentoo.org> | 2010-09-10 18:53:21 +0000 |
| commit | d7bb4dd988453497f7ca9b167c989640f39d643d (patch) | |
| tree | 41c0206a91e9eedbb5dad2d1568fa6e7fdb8951a | |
| parent | Merge branch 'upstream' into gentoo (diff) | |
| download | gitosis-gentoo-gentoo.tar.gz gitosis-gentoo-gentoo.tar.bz2 gitosis-gentoo-gentoo.zip | |
ignore malformatted ssh keys and go on with authorized_keys creationgentoo
Signed-off-by: Clemens Hammacher <hammacher@cs.uni-saarland.de>
| -rw-r--r-- | gitosis/ssh.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gitosis/ssh.py b/gitosis/ssh.py index bfd52fb..f8aba59 100644 --- a/gitosis/ssh.py +++ b/gitosis/ssh.py @@ -32,7 +32,10 @@ def readKeys(keydir): continue line = line.strip() if len(line) > 0: - yield (basename, sshkey.get_ssh_pubkey(line)) + try: + yield (basename, sshkey.get_ssh_pubkey(line)) + except sshkey.MalformedSSHKey as e: + log.warn('Malformed SSH key in %r: %r', filename, e); fp.close() COMMENT = '### autogenerated by gitosis, DO NOT EDIT' |