021456d libpkg: add the path when we fail to do a 3way merge — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: add the path when we fail to do a 3way merge

Kyle Evans committed 11 months ago

commit 021456dd006ec7980e48558cf7e0987477f4a354
parent fb98d46

1 file changed +1 -1

modified libpkg/pkg_add.c

@@ -247,7 +247,7 @@ attempt_to_merge(int rootfd, struct pkg_config_file *rcf, struct pkg *local,

 	newconf = xstring_new();
 	if (merge_3way(lcf->content, localconf, rcf->content, newconf) != 0) {
 		xstring_free(newconf);
 		pkg_emit_error("Impossible to merge configuration file");
 		pkg_emit_error("Impossible to merge configuration file: %s", rcf->path);
 	} else {
 		char *conf = xstring_get(newconf);
 		rcf->newcontent = conf;