From: Daniel Kolesa <d.kolesa@osg.samsung.com>
Date: Mon, 12 Mar 2018 10:36:50 +0000 (+0100)
Subject: eolian: only merge units on success when parsing all files
X-Git-Tag: upstream/1.21.0~1682
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dde9db8d22b844566bbf6d320bad22228c96b42e;p=platform%2Fupstream%2Fefl.git

eolian: only merge units on success when parsing all files
---

diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 6fc47ba..d99c849 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;
 }