From 6c3b7ac000ee281d26cdaa39f914f204fd6ffac1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 17 2017 12:29:47 +0000 Subject: Do not take forks into account when retrieving maintainers and watchers Otherwise we end up with people being considered while all they did was to fork the project. Signed-off-by: Pierre-Yves Chibon --- diff --git a/scripts/pagure_bz.py b/scripts/pagure_bz.py index a8252b9..dd44945 100644 --- a/scripts/pagure_bz.py +++ b/scripts/pagure_bz.py @@ -69,6 +69,10 @@ def main(args): model.Project.id == model.Watcher.project_id ).filter( model.Watcher.user_id == model.User.id + ).filter( + model.Project.parent_id == None + ).filter( + model.Project.is_fork == False ) for entry in query.all(): diff --git a/scripts/pagure_owner_alias.py b/scripts/pagure_owner_alias.py index 76417c5..26a807f 100644 --- a/scripts/pagure_owner_alias.py +++ b/scripts/pagure_owner_alias.py @@ -52,6 +52,10 @@ def main(args): model.Project.namespace, model.Project.name, model.User.user, ).filter( model.Project.user_id == model.User.id + ).filter( + model.Project.parent_id == None + ).filter( + model.Project.is_fork == False ) output = collections.defaultdict(dict) @@ -70,6 +74,10 @@ def main(args): model.ProjectUser.user_id == model.User.id ).filter( model.ProjectUser.access.in_(['commit', 'admin']) + ).filter( + model.Project.parent_id == None + ).filter( + model.Project.is_fork == False ) for entry in query.all():