diff --git a/tools/invite2summit/send.py b/tools/invite2summit/send.py index ccaf25c2af..85e8c53d26 100644 --- a/tools/invite2summit/send.py +++ b/tools/invite2summit/send.py @@ -27,7 +27,7 @@ from string import Template class ATC(object): def __init__(self, row): - self.lpid = row[0] + self.osfid = row[0] self.name = unicode(row[1], 'utf8') self.emails = row[2:] @@ -79,6 +79,6 @@ if __name__ == '__main__': session.sendmail(settings.EMAIL_FROM, committer.emails, msg.as_string()) - print "%s,ATC,%s" % (code, committer.name) + print "%s,%s,%s" % (code, committer.osfid, committer.name) session.quit() time.sleep(settings.EMAIL_PAUSE) diff --git a/tools/owners.py b/tools/owners.py index 506d33c9d3..b4e33c3569 100644 --- a/tools/owners.py +++ b/tools/owners.py @@ -628,19 +628,11 @@ def main(argv=sys.argv): owners[owner]['extra'].sort() # Build the data used for an invite - invite = [] - if 'username' not in owners[owner] or not owners[owner]['username']: - print( - 'SKIPPING MALFORMED OWNER: no username found for account %s' % - owner, file=sys.stderr) - continue - invite.append(owners[owner]['username']) if 'name' not in owners[owner] or not owners[owner]['name']: print( 'SKIPPING MALFORMED OWNER: no fullname found for account %s' % owner, file=sys.stderr) continue - invite.append(owners[owner]['name'].encode('utf-8')) if 'preferred' not in owners[owner]: if 'extra' in owners[owner] and owners[owner]['extra']: owners[owner]['preferred'] = owners[owner]['extra'][0] @@ -658,6 +650,8 @@ def main(argv=sys.argv): if member['data']: owners[owner]['member'] = member['data'][0]['id'] continue + invite = [owners[owner].get('member','0')] + invite.append(owners[owner]['name'].encode('utf-8')) invite.append(owners[owner]['preferred']) invite += owners[owner]['extra'] invites.append(invite)