altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Fix issue with bin/merge-person-records when User.last_login == None. Fixes #2274. Commit ready for merge.

Browse source 
- Legacy-Id: 13197
This commit is contained in:
Ryan Cross 2017-04-12 17:36:45 +00:00
parent b22c2a946c
commit 767e9f9695
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/bin/merge-person-records
View file

@ -27,6 +27,7 @@ django.setup()
# -------------------------------------------------------------------------------------
import argparse
import datetime
import pprint
import syslog
from django.contrib import admin
@ -54,7 +55,7 @@ def determine_merge_order(source,target):
if source.user and not target.user:
source,target = target,source # swap merge order
if source.user and target.user:
source,target = sorted([source,target],key=lambda a: a.user.last_login)
source,target = sorted([source,target],key=lambda a: a.user.last_login if a.user.last_login else datetime.datetime.min)
return source,target
def get_extra_primary(source,target):