diff --git a/mbs-fix-empty-requires.patch b/mbs-fix-empty-requires.patch new file mode 100644 index 0000000..d8e290c --- /dev/null +++ b/mbs-fix-empty-requires.patch @@ -0,0 +1,44 @@ +diff --git a/module_build_service/utils/mse.py b/module_build_service/utils/mse.py +index 4e7e92b..9b13c9b 100644 +--- a/module_build_service/utils/mse.py ++++ b/module_build_service/utils/mse.py +@@ -279,7 +279,7 @@ def generate_expanded_mmds(session, mmd, raise_if_stream_ambigous=False, default + # Each generated MMD must be new Module object... + # TODO: Use copy method once its in released libmodulemd: + # https://github.com/fedora-modularity/libmodulemd/pull/20 +- mmd_copy = Modulemd.Module.new_from_string(current_mmd.dumps()) ++ mmd_copy = Modulemd.Module.new_from_string(mmd.dumps()) + xmd = glib.from_variant_dict(mmd_copy.get_xmd()) + + # Requires contain the NSVC representing the input mmd. +diff --git a/tests/test_utils/test_utils_mse.py b/tests/test_utils/test_utils_mse.py +index 47bc5a3..302e254 100644 +--- a/tests/test_utils/test_utils_mse.py ++++ b/tests/test_utils/test_utils_mse.py +@@ -213,6 +213,14 @@ class TestUtilsModuleStreamExpansion: + set([ + frozenset(['gtk:1']) + ])), ++ ++ ({"gtk": []}, {"gtk": ["1"]}, True, ++ set([ ++ frozenset(['gtk:1:0:c2', 'platform:f28:0:c10']) ++ ]), ++ set([ ++ frozenset(['gtk:1']) ++ ])), + ]) + def test_generate_expanded_mmds_buildrequires( + self, requires, build_requires, stream_ambigous, expected_xmd, +@@ -293,6 +301,11 @@ class TestUtilsModuleStreamExpansion: + frozenset(['foo:1', 'gtk:1']), + ])), + ++ ({"gtk": [], "foo": []}, {"gtk": ["1"], "foo": ["1"]}, ++ set([ ++ frozenset([]), ++ ])), ++ + ]) + def test_generate_expanded_mmds_requires(self, requires, build_requires, expected): + self._generate_default_modules() diff --git a/module-build-service.spec b/module-build-service.spec index 7d94545..7d955f5 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,12 +1,13 @@ Name: module-build-service Version: 2.0.2 -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: mbs-fix-empty-requires.patch BuildArch: noarch @@ -146,6 +147,8 @@ for a number of tasks: # Workaround because python2-koji has no egg-info file at the momement sed -i '/koji/d' requirements.txt +%patch0 -p1 + # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc @@ -201,6 +204,9 @@ done %changelog +* Thu Apr 05 2018 Jan Kaluza - 2.0.2-2 +- fix issue with expanded requires section in case empty list is used as input. + * Thu Apr 05 2018 mprahl - 2.0.2-1 - New version - Clean up dependencies