diff --git a/gitosis/.init.py.swp b/gitosis/.init.py.swp deleted file mode 100644 index 973607a..0000000 Binary files a/gitosis/.init.py.swp and /dev/null differ diff --git a/gitosis/principals.py b/gitosis/principals.py index 32a9242..e095726 100644 --- a/gitosis/principals.py +++ b/gitosis/principals.py @@ -17,10 +17,7 @@ from gitosis import app from gitosis import util -def serve_principal(cfg, git_dir, sshUser, principals): - export = os.path.join(git_dir, 'gitosis-export') - # re-read config to get up-to-date settings - cfg.read(os.path.join(export, '..', 'gitosis.conf')) +def serve_principal(cfg, sshUser, principals): TEMPLATE=('command="gitosis-serve %(user)s",no-port-forwarding,' +'no-X11-forwarding,no-agent-forwarding,no-pty %(principals)s') @@ -51,14 +48,13 @@ class Main(app.App): log = logging.getLogger('gitosis.principals') - git_dir = os.environ.get('GIT_DIR') if git_dir is None: log.error('Must have GIT_DIR set in enviroment') sys.exit(1) if sshUser != "": log.info('Running serve_principal for user %s', sshUser) - serve_principal(cfg, git_dir, sshUser, principals) + serve_principal(cfg, sshUser, principals) log.info('Done.') # # if hook == 'post-update':