| 1 |
commit: 080e857b7081db90f874c73fd271d8bd699195d6 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 4 07:43:13 2016 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 4 07:43:13 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grumpy.git/commit/?id=080e857b |
| 7 |
|
| 8 |
sync: Update individual maintainer names during projects sync for the time being |
| 9 |
|
| 10 |
... until we don't have master data for this that we shouldn't overwrite. |
| 11 |
Also remove a now done TODO item and tweak a debug string I messed up pre-commit. |
| 12 |
|
| 13 |
backend/lib/sync.py | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/backend/lib/sync.py b/backend/lib/sync.py |
| 17 |
index 57a7cb1..4894315 100644 |
| 18 |
--- a/backend/lib/sync.py |
| 19 |
+++ b/backend/lib/sync.py |
| 20 |
@@ -37,7 +37,6 @@ def get_project_data(): |
| 21 |
if member_tag in ['email', 'name', 'role']: |
| 22 |
member[member_tag] = member_elem.text |
| 23 |
if 'email' in member: |
| 24 |
- # 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 |
| 25 |
if 'members' not in proj: |
| 26 |
proj['members'] = [] |
| 27 |
proj['members'].append(member) |
| 28 |
@@ -94,9 +93,12 @@ def sync_projects(): |
| 29 |
if 'members' in data: |
| 30 |
for member in data['members']: |
| 31 |
if member['email'] in existing_maintainers: |
| 32 |
+ # TODO: Stop overwriting the name from master data, if/once we have a proper sync source for individual maintainers (Gentoo LDAP?) |
| 33 |
+ if 'name' in member: |
| 34 |
+ existing_maintainers[member['email']].name = member['name'] |
| 35 |
members.append(existing_maintainers[member['email']]) |
| 36 |
else: |
| 37 |
- print("Adding individual %s" % member['email']) |
| 38 |
+ print("Adding individual maintainer %s" % member['email']) |
| 39 |
new_maintainer = Maintainer(email=member['email'], is_project=False, name=member['name'] if 'name' in member else None) |
| 40 |
db.session.add(new_maintainer) |
| 41 |
existing_maintainers[member['email']] = new_maintainer |
Archives