Skip to content

Commit 68bd38d

Browse files
committed
Fixes ietf-tools#2141. Resolve issue with merge_person_records caused by Django 1.8 upgrade. Commit ready for merge.
- Legacy-Id: 12724
1 parent 93b1ba1 commit 68bd38d

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

ietf/bin/merge-person-records

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,11 @@ def main():
165165
user = User.objects.filter(is_superuser=True).first()
166166
admin_site = admin.site
167167
using = 'default'
168-
deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
168+
deletable_objects = admin.utils.get_deleted_objects(
169169
objs, opts, user, admin_site, using)
170170

171-
if len(deletable_objects) > 1:
171+
deletable_objects_summary = deletable_objects[1]
172+
if len(deletable_objects_summary) > 1: # should only inlcude one object (Person)
172173
print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
173174
print "Related objects remain:"
174175
pprint.pprint(deletable_objects[1])

0 commit comments

Comments
 (0)