From 4d834d4c8ce0cbc187897c398d92e047e20238fc Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org>
Date: Jan 30 2017 22:24:43 +0000
Subject: Add a patch for PR #1232 (fixes issue #1251)


Signed-off-by: Jeremy Cline <jeremy@jcline.org>

---

diff --git a/0004-Fix-submitting-multiple-updates-at-a-time.patch b/0004-Fix-submitting-multiple-updates-at-a-time.patch
new file mode 100644
index 0000000..048990c
--- /dev/null
+++ b/0004-Fix-submitting-multiple-updates-at-a-time.patch
@@ -0,0 +1,31 @@
+From 9ac5f8436ed0845e12ff84066298e03367e28311 Mon Sep 17 00:00:00 2001
+From: Jeremy Cline <jeremy@jcline.org>
+Date: Thu, 19 Jan 2017 16:38:58 -0500
+Subject: [PATCH 2/2] Fix submitting multiple updates at a time
+
+The commit prior to this (04d04f31e08ba30aa289e5593f42fec748df9835)
+reloads the builds after committing a transaction, but accidentally
+references an old variable that results in the same build being queried
+for repeatedly. This caused submitting more than one build to break.
+
+Signed-off-by: Jeremy Cline <jeremy@jcline.org>
+---
+ bodhi/server/services/updates.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bodhi/server/services/updates.py b/bodhi/server/services/updates.py
+index 28ac2ce..e88f3f3 100644
+--- a/bodhi/server/services/updates.py
++++ b/bodhi/server/services/updates.py
+@@ -379,7 +379,7 @@ def new_update(request):
+         # were tied to the previous session that has now been terminated.
+         builds = []
+         releases = set()
+-        for build in data['builds']:
++        for nvr in data['builds']:
+             # At this moment, we are sure the builds are in the database (that is what the commit
+             # was for actually).
+             build = Build.get(nvr, request.db)
+-- 
+2.9.3
+
diff --git a/bodhi.spec b/bodhi.spec
index 3533108..8178278 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
 
 Name:           bodhi
 Version:        2.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -19,6 +19,8 @@ Patch1:         0001-Skip-builds-that-are-not-assigned-to-a-release.patch
 Patch2:         0002-Lock-the-buildsystem-while-logging-in.patch
 # https://github.com/fedora-infra/bodhi/pull/1163
 Patch3:         0003-Set-krb_rdns-to-False.patch
+# https://github.com/fedora-infra/bodhi/pull/1232
+Patch4:         0004-Fix-submitting-multiple-updates-at-a-time.patch
 
 # For the tests
 BuildRequires:   python2
@@ -215,6 +217,7 @@ updates for a software distribution.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Kill some dev deps
 sed -i '/pyramid_debugtoolbar/d' setup.py
@@ -336,6 +339,9 @@ PYTHONPATH=. %{__python} setup.py nosetests
 
 
 %changelog
+* Mon Jan 30 2017 Jeremy Cline <jeremy@jcline.org> - 2.3.3-3
+- Apply a patch that fixes one of the hotfixes applied in 2.3.3-2
+
 * Fri Jan 13 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 2.3.3-2
 - Apply four patches from git that are currently hotfixed on
   bodhi.fedoraproject.org.