q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5cc3abb425405af48810d777f5aa46cec2a66503
commit 5cc3abb425405af48810d777f5aa46cec2a66503 Author: Daniel Kolesa <[email protected]> Date: Mon Mar 12 11:36:50 2018 +0100 eolian: only merge units on success when parsing all files --- src/lib/eolian/eolian_database.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index 6fc47ba763..d99c8490cf 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -817,7 +817,7 @@ static Eina_Bool _tfile_parse(const Eina_Hash *hash EINA_UNUSED, const void *key unit = eo_parser_database_fill((Eolian_Unit *)pd->state, data, EINA_TRUE); pd->ret = !!unit; if (pd->ret) pd->ret = _parse_deferred(unit); - _merge_units(unit); + if (pd->ret) _merge_units(unit); return pd->ret; } @@ -846,7 +846,7 @@ static Eina_Bool _file_parse(const Eina_Hash *hash EINA_UNUSED, const void *key unit = eo_parser_database_fill((Eolian_Unit *)pd->state, data, EINA_FALSE); pd->ret = !!unit; if (pd->ret) pd->ret = _parse_deferred(unit); - _merge_units(unit); + if (pd->ret) _merge_units(unit); return pd->ret; } --
