Fix serious error in modulemd-defaults emitter
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
parent
c5ab744c8c
commit
25b1c759bb
34
0001-Defaults-emitter-should-use-the-correct-name-key.patch
Normal file
34
0001-Defaults-emitter-should-use-the-correct-name-key.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 2f302ac7dfa5d922cf1981752153f53a69eaa2c9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Date: Mon, 16 Apr 2018 08:29:15 -0400
|
||||||
|
Subject: [PATCH] Defaults emitter should use the correct name key
|
||||||
|
|
||||||
|
The specification requires that module name is represented as
|
||||||
|
"module: <modulename>", but the emitter was writing out
|
||||||
|
"name: <modulename>" instead.
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
---
|
||||||
|
modulemd/modulemd-yaml-emitter-defaults.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/modulemd/modulemd-yaml-emitter-defaults.c b/modulemd/modulemd-yaml-emitter-defaults.c
|
||||||
|
index cfd580a5dce40dc817d13e7e6bc09f6a7a786588..f6dc9e52a87ac8eed336ed475fd4dabebd19dfa7 100644
|
||||||
|
--- a/modulemd/modulemd-yaml-emitter-defaults.c
|
||||||
|
+++ b/modulemd/modulemd-yaml-emitter-defaults.c
|
||||||
|
@@ -190,11 +190,11 @@ _emit_defaults_data (yaml_emitter_t *emitter,
|
||||||
|
YAML_EMITTER_EMIT_WITH_ERROR_RETURN (
|
||||||
|
emitter, &event, error, "Error starting data mapping");
|
||||||
|
|
||||||
|
|
||||||
|
/* Module name */
|
||||||
|
- name = g_strdup ("name");
|
||||||
|
+ name = g_strdup ("module");
|
||||||
|
value = modulemd_defaults_dup_module_name (defaults);
|
||||||
|
MMD_YAML_EMIT_STR_STR_DICT (&event, name, value, YAML_PLAIN_SCALAR_STYLE);
|
||||||
|
|
||||||
|
|
||||||
|
/* Module default stream */
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: libmodulemd
|
Name: libmodulemd
|
||||||
Version: %{majorminorversion}%{?patchversion:.%{patchversion}}
|
Version: %{majorminorversion}%{?patchversion:.%{patchversion}}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Module metadata manipulation library
|
Summary: Module metadata manipulation library
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -23,6 +23,9 @@ BuildRequires: python3-gobject-base
|
|||||||
|
|
||||||
# Patches
|
# Patches
|
||||||
|
|
||||||
|
# Defaults emitter wasn't following the spec properly. Included upstream
|
||||||
|
# https://github.com/fedora-modularity/libmodulemd/commit/2f302ac7dfa5d922cf1981752153f53a69eaa2c9
|
||||||
|
Patch0001: 0001-Defaults-emitter-should-use-the-correct-name-key.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
C Library for manipulating module metadata files.
|
C Library for manipulating module metadata files.
|
||||||
@ -71,6 +74,9 @@ export LC_CTYPE=C.utf8
|
|||||||
%{_datadir}/gtk-doc/html/modulemd/
|
%{_datadir}/gtk-doc/html/modulemd/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 16 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.3.0-2
|
||||||
|
- Fix serious error in modulemd-defaults emitter
|
||||||
|
|
||||||
* Fri Apr 13 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.3.0-1
|
* Fri Apr 13 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.3.0-1
|
||||||
- Update to version 1.3.0
|
- Update to version 1.3.0
|
||||||
- New Public Objects:
|
- New Public Objects:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user