add feature flags for the build process, improve automatic rebuild

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 29ff318..d320ba6 100644 (file)
--- a/file.c
+++ b/file.c
@@ -122,7 +122,8 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 
        if (pctx->merge) {
                UCI_TRAP_SAVE(ctx, error);
-               uci_set(ctx, pctx->package, name, NULL, type, NULL);
+               if (uci_set(ctx, pctx->package, name, NULL, type, NULL) != UCI_OK)
+                       goto error;
                UCI_TRAP_RESTORE(ctx);
                return;
 error: