diff options
author | Mike Crute <mcrute@gmail.com> | 2011-02-24 08:27:13 -0500 |
---|---|---|
committer | Mike Crute <mcrute@gmail.com> | 2011-02-24 08:27:13 -0500 |
commit | 1595d82e8d057987c8fc0954bb116952581939d0 (patch) | |
tree | dfeff964b1909246a094ce13b8c14d50b852b353 | |
parent | f76ee8bee8794b1de67c9311503e2ec027be0d14 (diff) | |
download | hg_hosting-1595d82e8d057987c8fc0954bb116952581939d0.tar.bz2 hg_hosting-1595d82e8d057987c8fc0954bb116952581939d0.tar.xz hg_hosting-1595d82e8d057987c8fc0954bb116952581939d0.zip |
Making ssh key optional
-rw-r--r-- | repolib.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -203,13 +203,16 @@ class User(object): | |||
203 | self = cls(config['username'], config['name'], config['email']) | 203 | self = cls(config['username'], config['name'], config['email']) |
204 | 204 | ||
205 | self.can_create = ConfigLoader.as_bool(config['can_create']) | 205 | self.can_create = ConfigLoader.as_bool(config['can_create']) |
206 | self.ssh_key = config['ssh_key'] | 206 | self.ssh_key = config.get('ssh_key', None) |
207 | self.login_script = login_script | 207 | self.login_script = login_script |
208 | 208 | ||
209 | return self | 209 | return self |
210 | 210 | ||
211 | @property | 211 | @property |
212 | def ssh_line(self): | 212 | def ssh_line(self): |
213 | if not self.ssh_key: | ||
214 | return "" | ||
215 | |||
213 | return ('command="{self.login_script} {self.username}",' | 216 | return ('command="{self.login_script} {self.username}",' |
214 | 'no-port-forwarding,no-X11-forwarding,no-agent-forwarding' | 217 | 'no-port-forwarding,no-X11-forwarding,no-agent-forwarding' |
215 | ' {self.ssh_key} {self.email}\n').format(self=self) | 218 | ' {self.ssh_key} {self.email}\n').format(self=self) |