Adam Majer
12cf39b97e
- Add libyaml-revert-emitter-changes.patch: Revert "This code is not needed and breaks tests" (gh#yaml/libyaml#122). Fixes build of python-PyYAML. OBS-URL: https://build.opensuse.org/request/show/667048 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyaml?expand=0&rev=20
65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
From 8ee83c0da22fe9aa7dea667be8f899a7e32ffb83 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tina=20M=C3=BCller?= <cpan2@tinita.de>
|
|
Date: Fri, 29 Jun 2018 21:44:19 +0200
|
|
Subject: [PATCH 1/2] Revert removing of open_ended after top level plain
|
|
scalar
|
|
|
|
See also issue #60
|
|
|
|
Revert "This code is not needed and breaks tests"
|
|
|
|
This reverts commit 56400d976a1999156b1abfd674c3122843980260.
|
|
---
|
|
src/emitter.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/emitter.c b/src/emitter.c
|
|
index d31e075..32fe07c 100644
|
|
--- a/src/emitter.c
|
|
+++ b/src/emitter.c
|
|
@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
|
|
|
|
emitter->whitespace = 0;
|
|
emitter->indention = 0;
|
|
+ if (emitter->root_context)
|
|
+ {
|
|
+ emitter->open_ended = 1;
|
|
+ }
|
|
|
|
return 1;
|
|
}
|
|
|
|
From 56f4b17221868593d6903ee58d6d679b690cf4df Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tina=20M=C3=BCller?= <cpan2@tinita.de>
|
|
Date: Fri, 29 Jun 2018 23:16:26 +0200
|
|
Subject: [PATCH 2/2] Don't emit document-end marker at the end of stream
|
|
|
|
(only when explicitly requested)
|
|
|
|
@jrtc27++ for the patch.
|
|
|
|
See #60
|
|
---
|
|
src/emitter.c | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
diff --git a/src/emitter.c b/src/emitter.c
|
|
index 32fe07c..2744495 100644
|
|
--- a/src/emitter.c
|
|
+++ b/src/emitter.c
|
|
@@ -649,13 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
|
|
|
|
else if (event->type == YAML_STREAM_END_EVENT)
|
|
{
|
|
- if (emitter->open_ended)
|
|
- {
|
|
- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
|
|
- return 0;
|
|
- if (!yaml_emitter_write_indent(emitter))
|
|
- return 0;
|
|
- }
|
|
|
|
if (!yaml_emitter_flush(emitter))
|
|
return 0;
|
|
|