From 58df41fcc84368f4ae032a4385f94474ec08cace Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Nov 19 2018 20:36:49 +0000
Subject: Merge branch 'master' into f27


---

diff --git a/db_migration_context_fix.patch b/db_migration_context_fix.patch
new file mode 100644
index 0000000..7f663e5
--- /dev/null
+++ b/db_migration_context_fix.patch
@@ -0,0 +1,22 @@
+From ba3bef9f4643e10444ecbffd36769d274b507f4b Mon Sep 17 00:00:00 2001
+From: mprahl <mprahl@redhat.com>
+Date: Nov 01 2018 13:38:02 +0000
+Subject: Don't assume the context is set on base modules in the 526fb7d445f7_module_buildrequires migration
+
+
+---
+
+diff --git a/module_build_service/migrations/versions/526fb7d445f7_module_buildrequires.py b/module_build_service/migrations/versions/526fb7d445f7_module_buildrequires.py
+index e8192d5..6b23cad 100644
+--- a/module_build_service/migrations/versions/526fb7d445f7_module_buildrequires.py
++++ b/module_build_service/migrations/versions/526fb7d445f7_module_buildrequires.py
+@@ -80,7 +80,7 @@ def upgrade():
+                 .where(mb.c.name == base_module)\
+                 .where(mb.c.stream == base_module_dict['stream'])\
+                 .where(mb.c.version == base_module_dict['version'])\
+-                .where(mb.c.context == base_module_dict['context'])
++                .where(mb.c.context == base_module_dict.get('context'))
+             br = connection.execute(select).fetchone()
+             if not br:
+                 # If the buildrequire isn't in the datbase, then skip it
+
diff --git a/module-build-service.spec b/module-build-service.spec
index 2aca8e7..e751e05 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -5,13 +5,14 @@
 
 Name:           module-build-service
 Version:        2.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Module Build Service for Modularity
 
 Group:          Development/Tools
 License:        MIT
 URL:            https://pagure.io/fm-orchestrator
 Source0:        https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
+Patch0:         db_migration_context_fix.patch
 
 BuildArch:      noarch
 
@@ -211,6 +212,8 @@ for a number of tasks:
 %prep
 %setup -q
 
+%patch0 -p1
+
 # Workaround because python2-koji has no egg-info file at the momement
 sed -i '/koji/d' requirements.txt
 
@@ -293,6 +296,9 @@ done
 
 
 %changelog
+* Mon Nov 19 2018 mprahl <mprahl@redhat.com> - 2.8.1-2
+- Don't assume the context is set on base modules in the 526fb7d445f7_module_buildrequires migration
+
 * Mon Nov 19 2018 mprahl <mprahl@redhat.com> - 2.8.1-1
 - new version