From 767e9f96952a487c03198c3b16df3b00b765aec6 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Wed, 12 Apr 2017 17:36:45 +0000 Subject: [PATCH] Fix issue with bin/merge-person-records when User.last_login == None. Fixes #2274. Commit ready for merge. - Legacy-Id: 13197 --- ietf/bin/merge-person-records | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records index 4bf4cd5a2..57d1ab4ea 100755 --- a/ietf/bin/merge-person-records +++ b/ietf/bin/merge-person-records @@ -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):