Properly handle promise locking with edit line

Fixed bug causing rendered files can result in erroneously empty files
as a result of promise locking.

Ticket: ENT-9980
Changelog: Commit
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

cf-agent/verify_files.c

@@ -754,7 +754,10 @@ static PromiseResult RenderTemplateCFEngine(EvalContext *ctx,
         EvalContextStackPushBundleFrame(ctx, bp, bundle_args, a.edits.inherit);
         BundleResolve(ctx, bp);
 
-        ScheduleEditLineOperations(ctx, bp, &a, pp, edcontext);
+        /* We don't record the change yet, because it may be changed to
+         * PROMISE_RESULT_NOOP if there is no diff in contents */
+        result = ScheduleEditLineOperations(ctx, bp, &a, pp, edcontext)
+            ? PROMISE_RESULT_CHANGE : PROMISE_RESULT_SKIPPED;
 
         EvalContextStackPopFrame(ctx);
 
@@ -1014,7 +1017,10 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, char *filename,
 
             BundleResolve(ctx, bp);
 
-            ScheduleEditLineOperations(ctx, bp, a, pp, edcontext);
+            /* We don't record the change yet, because it may be changed to
+             * PROMISE_RESULT_NOOP if there is no diff in contents */
+            result = ScheduleEditLineOperations(ctx, bp, a, pp, edcontext)
+                ? PROMISE_RESULT_CHANGE : PROMISE_RESULT_SKIPPED;
 
             EvalContextStackPopFrame(ctx);
         }