Skip to content

Commit 767e9f9

Browse files
committed
Fix issue with bin/merge-person-records when User.last_login == None. Fixes ietf-tools#2274. Commit ready for merge.
- Legacy-Id: 13197
1 parent b22c2a9 commit 767e9f9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

ietf/bin/merge-person-records

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ django.setup()
2727
# -------------------------------------------------------------------------------------
2828

2929
import argparse
30+
import datetime
3031
import pprint
3132
import syslog
3233
from django.contrib import admin
@@ -54,7 +55,7 @@ def determine_merge_order(source,target):
5455
if source.user and not target.user:
5556
source,target = target,source # swap merge order
5657
if source.user and target.user:
57-
source,target = sorted([source,target],key=lambda a: a.user.last_login)
58+
source,target = sorted([source,target],key=lambda a: a.user.last_login if a.user.last_login else datetime.datetime.min)
5859
return source,target
5960

6061
def get_extra_primary(source,target):

0 commit comments

Comments
 (0)