diff options
| author |   Tommi Virtanen <tv@eagain.net> | 2007-11-18 18:08:09 +0200 |
|---|---|---|
| committer | Tommi Virtanen <tv@eagain.net> | 2007-11-18 18:08:09 +0200 |
| commit | 107833667a2b2445f2de4224829f4d9eaa6e73d0 (patch) | |
| tree | faa799928814aec712f95ac280037365c2e8666a /gitosis/ssh.py | |
| parent | When autocreating repositories on push, set git-daemon-export-ok etc. (diff) | |
| download | gitosis-gentoo-107833667a2b2445f2de4224829f4d9eaa6e73d0.tar.gz gitosis-gentoo-107833667a2b2445f2de4224829f4d9eaa6e73d0.tar.bz2 gitosis-gentoo-107833667a2b2445f2de4224829f4d9eaa6e73d0.zip | |
Let *.pub files have multiple lines, each containing one SSH key.
Makes managing accounts and access for people with multiple client
machines easier.
Diffstat (limited to 'gitosis/ssh.py')
| -rw-r--r-- | gitosis/ssh.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gitosis/ssh.py b/gitosis/ssh.py index 7a70ed4..3eb5c37 100644 --- a/gitosis/ssh.py +++ b/gitosis/ssh.py @@ -13,12 +13,10 @@ def readKeys(keydir): path = os.path.join(keydir, filename) f = file(path) - try: - line = f.readline() - finally: - f.close() - line = line.rstrip('\n') - yield (basename, line) + for line in f: + line = line.rstrip('\n') + yield (basename, line) + f.close() COMMENT = '### autogenerated by gitosis, DO NOT EDIT' |