1.1 --- a/NEWS Tue Nov 17 12:36:56 2009 +0000
1.2 +++ b/NEWS Tue Dec 01 15:35:30 2009 +0000
1.3 @@ -12,7 +12,7 @@
1.4
1.5 Upgrading: move the paths/hgrc entry in .mercurial-server to env/HGRCPATH,
1.6 and add an entry under paths that reads
1.7 -"authorizedkeys = ~/.ssh/authorized_keys"
1.8 +"authorized_keys = ~/.ssh/authorized_keys"
1.9
1.10 ====================
1.11 mercurial-server 0.9
2.1 --- a/src/init/dot-mercurial-server Tue Nov 17 12:36:56 2009 +0000
2.2 +++ b/src/init/dot-mercurial-server Tue Dec 01 15:35:30 2009 +0000
2.3 @@ -3,7 +3,7 @@
2.4
2.5 [paths]
2.6 repos = ~/repos
2.7 -authorizedkeys = ~/.ssh/authorized_keys
2.8 +authorized_keys = ~/.ssh/authorized_keys
2.9 keys = /etc/mercurial-server/keys:~/repos/hgadmin/keys
2.10 access = /etc/mercurial-server/access.conf:~/repos/hgadmin/access.conf
2.11
3.1 --- a/src/mercurialserver/config.py Tue Nov 17 12:36:56 2009 +0000
3.2 +++ b/src/mercurialserver/config.py Tue Dec 01 15:35:30 2009 +0000
3.3 @@ -27,9 +27,10 @@
3.4
3.5 def configExists():
3.6 try:
3.7 - _getAuthorizedKeysPath()
3.8 + getAuthorizedKeysPath()
3.9 return True
3.10 - except:
3.11 + except Exception, e:
3.12 + print e
3.13 return False
3.14
3.15 def getKeysPaths(): return _getPaths("keys")