dd9f469 mis-merge fix — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

mis-merge fix

Matthew Seaman committed 13 years ago

commit dd9f469eb0daaea9cdcbc07838c6ed026c53a609
parent 7021b09

1 file changed +4 -2

modified libpkg/pkg_elf.c

@@ -107,6 +107,7 @@ test_depends(void *actdata, struct pkg *pkg, const char *name)

 	struct pkgdb_it *it = NULL;
 	struct pkg *d;
 	const char *deporigin, *depname, *depversion;
 	bool deplocked;
 	char pathbuf[MAXPATHLEN];
 	bool found;
 	bool shlibs = false;

@@ -150,8 +151,9 @@ test_depends(void *actdata, struct pkg *pkg, const char *name)

 		}
 		if (!found) {
 			pkg_emit_error("adding forgotten depends (%s): %s-%s",
 					pathbuf, depname, depversion);
 			pkg_adddep(pkg, depname, deporigin, depversion, deplocked);
 			    pathbuf, depname, depversion);
 			pkg_adddep(pkg, depname, deporigin, depversion,
 			    deplocked);
 		}
 		pkg_free(d);
 	}