Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
libpkg: don't create .pkgnew if the file didn't exist
Kyle Evans committed 6 years ago
commit e47d3d345a9affbc9dd67862cf947c37ae154ff5
parent 4982c60
1 file changed +2 -1
modified libpkg/pkg_add.c
@@ -733,7 +733,8 @@ pkg_extract_finalize(struct pkg *pkg)
		if (*f->temppath == '\0')
			continue;
		fto = f->path;
-
		if (f->config && f->config->status == MERGE_FAILED) {
+
		if (f->config && f->config->status == MERGE_FAILED &&
+
		    f->previous != PKG_FILE_NONE) {
			snprintf(path, sizeof(path), "%s.pkgnew", f->path);
			fto = path;
		}