Skip to content

Commit

Permalink
fixup! lib/deploy: Port config merge logic to new code style
Browse files Browse the repository at this point in the history
  • Loading branch information
jlebon committed May 24, 2017
1 parent e2282b8 commit 318e6dc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libostree/ostree-sysroot-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ merge_configuration_from (OstreeSysroot *sysroot,
if (!ostree_diff_dirs (OSTREE_DIFF_FLAGS_IGNORE_XATTRS,
orig_etc, modified_etc, modified, removed, added,
cancellable, error))
return glnx_prefix_error (error, "While computing configuration diff: ");
return glnx_prefix_error (error, "While computing configuration diff");

ot_log_structured_print_id_v (OSTREE_CONFIGMERGE_ID,
"Copying /etc changes: %u modified, %u removed, %u added",
Expand Down

0 comments on commit 318e6dc

Please sign in to comment.