diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2007-12-24 04:11:20 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-12-24 04:11:20 -0800 |
commit | d3c5cf94316443f588b88b7e8a9ef1accef16f68 (patch) | |
tree | 05ac9402ebec90a7dacc7fd9dc69766aea079aae | |
parent | ssh-dsa is the actual correct name, but SSH accepts ssh-dss as an alias. (diff) | |
download | gitosis-dakkar-d3c5cf94316443f588b88b7e8a9ef1accef16f68.tar.gz gitosis-dakkar-d3c5cf94316443f588b88b7e8a9ef1accef16f68.tar.bz2 gitosis-dakkar-d3c5cf94316443f588b88b7e8a9ef1accef16f68.zip |
Support filename for input.
-rw-r--r-- | gitosis/init.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gitosis/init.py b/gitosis/init.py index cb21cbd..2004ddd 100644 --- a/gitosis/init.py +++ b/gitosis/init.py @@ -20,10 +20,12 @@ from gitosis import app # pylint: disable-msg=C0103 log = logging.getLogger('gitosis.init') -def read_ssh_pubkey(fp=None): #pragma: no cover +def read_ssh_pubkey(filename=None): #pragma: no cover """Read an SSH public key from stdin or file.""" - if fp is None: + if filename is None: fp = sys.stdin + else: + fp = file(filename) line = fp.readline() return line |