commit: 080e857b7081db90f874c73fd271d8bd699195d6
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 07:43:13 2016 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> 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
