Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2604f4f
Reinstall packages if shlib provided has changed
Baptiste Daroussin committed 11 years ago
commit 2604f4f3fd5d007fd9399920ac36ad0b22c1b371
parent ae10406
1 file changed +22 -1
modified libpkg/pkg_jobs.c
@@ -1201,6 +1201,27 @@ pkg_jobs_need_upgrade(struct pkg *rp, struct pkg *lp)


	/* Finish by the shlibs */

	for (;;) {
+ 
		ret1 = pkg_shlibs_provided(rp, &rs);
+ 
		ret2 = pkg_shlibs_provided(lp, &ls);
+ 
		if (ret1 != ret2) {
+ 
			free(rp->reason);
+ 
			rp->reason = strdup("provided shared library changed");
+ 
			return (true);
+ 
		}
+ 
		if (ret1 == EPKG_OK) {
+ 
			if (strcmp(rs->name, ls->name) != 0) {
+ 
				free(rp->reason);
+ 
				rp->reason = strdup("provided shared library changed");
+ 
				pkg_debug(1, "provided shlib changed %s -> %s",
+ 
				    ls->name, rs->name);
+ 
				return (true);
+ 
			}
+ 
		}
+ 
		else
+ 
			break;
+ 
	}
+
+ 
	for (;;) {

		ret1 = pkg_shlibs_required(rp, &rs);

		ret2 = pkg_shlibs_required(lp, &ls);

		if (ret1 != ret2) {
@@ -1212,7 +1233,7 @@ pkg_jobs_need_upgrade(struct pkg *rp, struct pkg *lp)
			if (strcmp(rs->name, ls->name) != 0) {

				free(rp->reason);

				rp->reason = strdup("needed shared library changed");
- 
				pkg_debug(1, "shlib changed %s -> %s",
+ 
				pkg_debug(1, "Required shlib changed %s -> %s",

				    ls->name, rs->name);

				return (true);

			}