From e04a5440b1eb98eff2df5d152a9c0c4dd18aa740 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 13 2015 10:12:05 +0000 Subject: Invert the gitolite version check to be what it should --- diff --git a/pagure/__init__.py b/pagure/__init__.py index d97dd26..9e054e0 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -143,11 +143,11 @@ def generate_gitolite_acls(): gitolite_folder = APP.config.get('GITOLITE_HOME', None) gitolite_version = APP.config.get('GITOLITE_VERSION', 3) if gitolite_folder: - if gitolite_version == 3: + if gitolite_version == 2: cmd = 'GL_RC=%s GL_BINDIR=%s gl-compile-conf' % ( APP.config.get('GL_RC'), APP.config.get('GL_BINDIR') ) - elif gitolite_version == 2: + elif gitolite_version == 3: cmd = 'HOME=%s gitolite compile && HOME=%s gitolite trigger '\ 'POST_COMPILE' % ( APP.config.get('GITOLITE_HOME'), @@ -191,12 +191,12 @@ def generate_authorized_key_file(): # pragma: no cover for user in users: if not user.public_ssh_key: continue - if gitolite_version == 3: + if gitolite_version == 2: row = 'command="/usr/bin/gl-auth-command %s",' \ 'no-port-forwarding,no-X11-forwarding,'\ 'no-agent-forwarding,no-pty %s' % ( user.user, user.public_ssh_key) - elif gitolite_version == 2: + elif gitolite_version == 3: row = 'command="HOME=%s '\ '/usr/share/gitolite3/gitolite-shell %s",' \ 'no-port-forwarding,no-X11-forwarding,'\