From 3d5862a9d463e21bdc9d76dea438079cb67f6c8b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 20 Jul 2017 12:43:38 +0000
Subject: [PATCH] Changed get_timeslot_for_filename() to not blow up in the
 presence of duplicate timeslots.  - Legacy-Id: 13952

---
 ietf/secr/proceedings/proc_utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py
index 84f8cf8d5..e8d3c638e 100644
--- a/ietf/secr/proceedings/proc_utils.py
+++ b/ietf/secr/proceedings/proc_utils.py
@@ -142,10 +142,13 @@ def get_timeslot_for_filename(filename):
             meeting = Meeting.objects.get(number=match.groupdict()['number'])
             room_mapping = {normalize_room_name(room.name): room.name for room in meeting.room_set.all()}
             time = datetime.datetime.strptime(match.groupdict()['time'],'%Y%m%d-%H%M')
-            return TimeSlot.objects.get(
+            slots = TimeSlot.objects.filter(
                 meeting=meeting,
                 location__name=room_mapping[match.groupdict()['room']],
-                time=time)
+                time=time,
+                sessionassignments__schedule=meeting.agenda,
+            ).distinct()
+            return slots.get()
         except (ObjectDoesNotExist, KeyError):
             return None