modules/module-build-service-rpm
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/module-build-service.git synced 2026-11-03 06:33:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into f27

Browse Source
This commit is contained in:
mprahl
2018-11-19 15:36:49 -05:00
parent 92cc9af184 3775dd6d0d
commit 58df41fcc8
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
db_migration_context_fix.patch Normal file
View File

@@ -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

8
module-build-service.spec
View File

@@ -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