# HG changeset patch # User Paul Crowley # Date 1259681730 0 # Node ID ff08fd5b1a622fb42efb8327de25e9f5d9d247e9 # Parent c4c3facf5d6b6f7d9025a0bf70b500c53fb544aa Fix configExists properly diff -r c4c3facf5d6b -r ff08fd5b1a62 NEWS --- a/NEWS Tue Nov 17 12:36:56 2009 +0000 +++ b/NEWS Tue Dec 01 15:35:30 2009 +0000 @@ -12,7 +12,7 @@ Upgrading: move the paths/hgrc entry in .mercurial-server to env/HGRCPATH, and add an entry under paths that reads -"authorizedkeys = ~/.ssh/authorized_keys" +"authorized_keys = ~/.ssh/authorized_keys" ==================== mercurial-server 0.9 diff -r c4c3facf5d6b -r ff08fd5b1a62 src/init/dot-mercurial-server --- a/src/init/dot-mercurial-server Tue Nov 17 12:36:56 2009 +0000 +++ b/src/init/dot-mercurial-server Tue Dec 01 15:35:30 2009 +0000 @@ -3,7 +3,7 @@ [paths] repos = ~/repos -authorizedkeys = ~/.ssh/authorized_keys +authorized_keys = ~/.ssh/authorized_keys keys = /etc/mercurial-server/keys:~/repos/hgadmin/keys access = /etc/mercurial-server/access.conf:~/repos/hgadmin/access.conf diff -r c4c3facf5d6b -r ff08fd5b1a62 src/mercurialserver/config.py --- a/src/mercurialserver/config.py Tue Nov 17 12:36:56 2009 +0000 +++ b/src/mercurialserver/config.py Tue Dec 01 15:35:30 2009 +0000 @@ -27,9 +27,10 @@ def configExists(): try: - _getAuthorizedKeysPath() + getAuthorizedKeysPath() return True - except: + except Exception, e: + print e return False def getKeysPaths(): return _getPaths("keys")