From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B7811395E2 for ; Sun, 4 Dec 2016 07:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FBB221C1ED; Sun, 4 Dec 2016 07:44:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E0A321C1ED for ; Sun, 4 Dec 2016 07:44:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67B66340E75 for ; Sun, 4 Dec 2016 07:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C42F24A2 for ; Sun, 4 Dec 2016 07:44:18 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1480837393.080e857b7081db90f874c73fd271d8bd699195d6.leio@gentoo> Subject: [gentoo-commits] proj/grumpy:master commit in: backend/lib/ X-VCS-Repository: proj/grumpy X-VCS-Files: backend/lib/sync.py X-VCS-Directories: backend/lib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 080e857b7081db90f874c73fd271d8bd699195d6 X-VCS-Branch: master Date: Sun, 4 Dec 2016 07:44:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5cf84e8e-01a7-45e1-a38c-27a00f826a94 X-Archives-Hash: e0f18f8132a5b03552813432fd695623 commit: 080e857b7081db90f874c73fd271d8bd699195d6 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Dec 4 07:43:13 2016 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Dec 4 07:43:13 2016 +0000 URL: https://gitweb.gentoo.org/proj/grumpy.git/commit/?id=080e857b sync: Update individual maintainer names during projects sync for the time being ... until we don't have master data for this that we shouldn't overwrite. Also remove a now done TODO item and tweak a debug string I messed up pre-commit. backend/lib/sync.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/lib/sync.py b/backend/lib/sync.py index 57a7cb1..4894315 100644 --- a/backend/lib/sync.py +++ b/backend/lib/sync.py @@ -37,7 +37,6 @@ def get_project_data(): if member_tag in ['email', 'name', 'role']: member[member_tag] = member_elem.text if 'email' in member: - # TODO: Sync the members (it's valid as email is given) - maybe at the end, after we have synced the project data, so we can add him to the project directly if 'members' not in proj: proj['members'] = [] proj['members'].append(member) @@ -94,9 +93,12 @@ def sync_projects(): if 'members' in data: for member in data['members']: if member['email'] in existing_maintainers: + # TODO: Stop overwriting the name from master data, if/once we have a proper sync source for individual maintainers (Gentoo LDAP?) + if 'name' in member: + existing_maintainers[member['email']].name = member['name'] members.append(existing_maintainers[member['email']]) else: - print("Adding individual %s" % member['email']) + print("Adding individual maintainer %s" % member['email']) new_maintainer = Maintainer(email=member['email'], is_project=False, name=member['name'] if 'name' in member else None) db.session.add(new_maintainer) existing_maintainers[member['email']] = new_maintainer