From 89ad4b0c08e8b4c984c253d7e85dfba56cd350e3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sep 11 2018 00:57:34 +0000 Subject: Apply #1013. --- diff --git a/1013.patch b/1013.patch new file mode 100644 index 0000000..4779b78 --- /dev/null +++ b/1013.patch @@ -0,0 +1,27 @@ +From 3a601d27de845907e2e11411589321e28c8604b7 Mon Sep 17 00:00:00 2001 +From: Ralph Bean +Date: Sep 11 2018 00:47:55 +0000 +Subject: Fix bug breaking local builds. + + +This bug was reported by @nphillip here https://bodhi.fedoraproject.org/updates/FEDORA-2018-c9c3a37d96 + +The issue is that the `record_filtered_rpms` method returns a new xmd +buildrequires block, but whole buildrequires entries were omitted in the return +value for local builds. This one-liner includes them again. + +--- + +diff --git a/module_build_service/utils/submit.py b/module_build_service/utils/submit.py +index 95f3060..ac70440 100644 +--- a/module_build_service/utils/submit.py ++++ b/module_build_service/utils/submit.py +@@ -59,6 +59,7 @@ def record_filtered_rpms(mmd): + # In case this is module resubmit or local build, the filtered_rpms + # will already be there, so there is no point in generating them again. + if "filtered_rpms" in req_data: ++ new_buildrequires[req_name] = req_data + continue + + # We can just get the first modulemd data from result right here thanks to + diff --git a/module-build-service.spec b/module-build-service.spec index 3c13e0d..6ee5c34 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -5,13 +5,15 @@ Name: module-build-service Version: 2.6.0 -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 +# https://pagure.io/fm-orchestrator/pull-request/1013.patch +Patch0: 1013.patch BuildArch: noarch @@ -210,6 +212,9 @@ 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 @@ -292,6 +297,9 @@ done %changelog +* Mon Sep 10 2018 Ralph Bean - 2.6.0-2 +- Apply https://pagure.io/fm-orchestrator/pull-request/1013.patch + * Fri Sep 07 2018 Ralph Bean - 2.6.0-1 - new version