From 1a079d68471fa436f92fd7cb00e089a6ca4776c1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 02 2015 10:31:35 +0000 Subject: Adjust the fedmsg_hook to act on the project object rather than its name --- diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 93f0ff3..60b9352 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -15,7 +15,7 @@ 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 import pagure.lib.git abspath = os.path.abspath(os.environ['GIT_DIR']) @@ -65,7 +65,11 @@ for line in sys.stdin.readlines(): break revs = pagure.lib.git.get_revs_between(oldrev, newrev, abspath) - project = pagure.lib.git.get_repo_name(abspath) + project_name = pagure.lib.git.get_repo_name(abspath) + username = pagure.lib.git.get_username(abspath) + project = pagure.lib.get_project(pagure.SESSION, project_name, username) + if not project: + project = project_name def _build_commit(rev): files, total = build_stats(rev) @@ -88,8 +92,9 @@ for line in sys.stdin.readlines(): ), rev=unicode(rev), path=abspath, - username=pagure.lib.git.get_username(abspath), - repo=project, + username=username, + repo=project.to_json(public=True) + if not isinstance(project, basestring) else project, branch=refname, agent=os.getlogin(), )