PR#56: Adjust pagure-dist-git for the pagure 4.0+ - pagure-dist-git

Pierre-Yves Chibon • 7 years ago

d5ca017

Pierre-Yves Chibon • 7 years ago

8cd6f71

Pierre-Yves Chibon • 7 years ago

c2941f7

dist_git_auth.py

file modified

+3 -3

		`@@ -21,7 +21,7 @@`
		`os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg'`

		`import pagure # noqa: E402`
		`- from pagure import APP # noqa: E402`
		`+ from pagure.config import config # noqa: E402`
		`from pagure.lib import model # noqa: E402`
		`from pagure.lib.git_auth import Gitolite3Auth, _read_file # noqa: E402`

		`@@ -46,7 +46,7 @@`

		`def get_supported_branches(namespace, package):`
		`default_url = 'https://pdc.fedoraproject.org/rest_api/v1/'`
		`- url = pagure.APP.config.get('PDC_URL', default_url)`
		`+ url = config.get('PDC_URL', default_url)`
		`pdc = pdc_client.PDCClient(url, develop=True)`
		`_log.info('Querying PDC for %s/%s' % (namespace, package))`
		`kwargs = dict(`
		`@@ -67,7 +67,7 @@`
		`configuration file.`
		`"""`
		`_log.info('Compiling the gitolite configuration')`
		`- gitolite_folder = pagure.APP.config.get('GITOLITE_HOME', None)`
		`+ gitolite_folder = config.get('GITOLITE_HOME', None)`
		`if gitolite_folder:`
		`cmd = 'HOME=%s gitolite compile' % (gitolite_folder)`
		`_log.debug('Command: %s', cmd)`

scripts/pagure_bz.py

file modified

+11 -5

		`@@ -14,14 +14,16 @@`
		`import logging`
		`import os`

		`+ import pagure.config`
		`+ from pagure.lib import model`
		`+`
		`+`
		`if 'PAGURE_CONFIG' not in os.environ \`
		`and os.path.exists('/etc/pagure/pagure.cfg'):`
		`os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg'`

		`- import pagure # noqa: E402`
		`- from pagure.lib import model # noqa: E402`
		`-`

		`+ _config = pagure.config.reload_config()`
		`_log = logging.getLogger(__name__)`


		`@@ -47,8 +49,10 @@`
		`print('%s does not appear to be a directory' % args[0])`
		`return 3`

		`+ session = pagure.lib.create_session(_config['DB_URL'])`
		`+`
		`# Start the watchers by the main admin`
		`- query = pagure.SESSION.query(`
		`+ query = session.query(`
		`model.Project.namespace, model.Project.name, model.User.user,`
		`).filter(`
		`model.Project.user_id == model.User.id`
		`@@ -66,7 +70,7 @@`

		`# Add the explicit watchers`

		`- query = pagure.SESSION.query(`
		`+ query = session.query(`
		`model.Project.namespace, model.Project.name, model.User.user,`
		`model.Watcher.watch_issues,`
		`).filter(`
		`@@ -95,6 +99,8 @@`
		`with open(os.path.join(args[0], 'pagure_bz.json'), 'w') as stream:`
		`json.dump(final, stream, indent=4, sort_keys=True)`

		`+ session.remove()`
		`+`

		`if __name__ == '__main__':`
		`import sys`

scripts/pagure_owner_alias.py

file modified

+11 -5

		`@@ -14,14 +14,16 @@`
		`import logging`
		`import os`

		`+ import pagure.config`
		`+ from pagure.lib import model`
		`+`
		`+`
		`if 'PAGURE_CONFIG' not in os.environ \`
		`and os.path.exists('/etc/pagure/pagure.cfg'):`
		`os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg'`

		`- import pagure # noqa: E402`
		`- from pagure.lib import model # noqa: E402`
		`-`

		`+ _config = pagure.config.reload_config()`
		`_log = logging.getLogger(__name__)`


		`@@ -47,8 +49,10 @@`
		`print('%s does not appear to be a directory' % args[0])`
		`return 3`

		`+ session = pagure.lib.create_session(_config['DB_URL'])`
		`+`
		`# Start the owner list by the main admin`
		`- query = pagure.SESSION.query(`
		`+ query = session.query(`
		`model.Project.namespace, model.Project.name, model.User.user,`
		`).filter(`
		`model.Project.user_id == model.User.id`
		`@@ -66,7 +70,7 @@`

		`# Add the users with commit and admin ACLs`

		`- query = pagure.SESSION.query(`
		`+ query = session.query(`
		`model.Project.namespace, model.Project.name, model.User.user,`
		`).filter(`
		`model.Project.id == model.ProjectUser.project_id`
		`@@ -93,6 +97,8 @@`
		`with open(os.path.join(args[0], 'pagure_owner_alias.json'), 'w') as stream:`
		`json.dump(final, stream, indent=4, sort_keys=True)`

		`+ session.remove()`
		`+`

		`if __name__ == '__main__':`
		`import sys`

scripts/pagure_poc.py

file modified

+9 -4

		`@@ -14,14 +14,15 @@`
		`import logging`
		`import os`

		`+ import pagure.config`
		`+ from pagure.lib import model`
		`+`
		`if 'PAGURE_CONFIG' not in os.environ \`
		`and os.path.exists('/etc/pagure/pagure.cfg'):`
		`os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg'`

		`- import pagure # noqa: E402`
		`- from pagure.lib import model # noqa: E402`
		`-`

		`+ _config = pagure.config.reload_config()`
		`_log = logging.getLogger(__name__)`


		`@@ -47,7 +48,9 @@`
		`print('%s does not appear to be a directory' % args[0])`
		`return 3`

		`- query = pagure.SESSION.query(`
		`+ session = pagure.lib.create_session(_config['DB_URL'])`
		`+`
		`+ query = session.query(`
		`model.Project.namespace, model.Project.name, model.User.user`
		`).filter(`
		`model.Project.user_id == model.User.id`
		`@@ -66,6 +69,8 @@`
		`with open(os.path.join(args[0], 'pagure_poc.json'), 'w') as stream:`
		`json.dump(output, stream, indent=4, sort_keys=True)`

		`+ session.remove()`
		`+`

		`if __name__ == '__main__':`
		`import sys`

template/commits.html

file modified

+1 -1

		`@@ -201,7 +201,7 @@`
		`success: function(res) {`
		`for (var _c in res.heads) {`
		`for (var i=0; i < res.heads[_c].length; i++){`
		`- var _url = '{{ url_for('.view_commits',`
		`+ var _url = '{{ url_for('ui_ns.view_commits',`
		`repo=repo.name,`
		`branchname='---',`
		`username=username,`