69d9856 Fix deletion in case of upgrade. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix deletion in case of upgrade.

Vsevolod Stakhov committed 12 years ago

commit 69d985624ab532a75e1245f0fb5c3287ba4bfe0d
parent aff8dba

2 files changed +8 -6

modified libpkg/pkg_delete.c

@@ -80,10 +80,12 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 	}
 	/* If there are dependencies */
 	if (pkg_rdeps(pkg, &rdep) == EPKG_OK) {
 		pkg_emit_required(pkg, flags & PKG_DELETE_FORCE);
 		if ((flags & PKG_DELETE_FORCE) == 0)
 			return (EPKG_REQUIRED);
 	if (flags & PKG_DELETE_UPGRADE == 0) {
 		if (pkg_rdeps(pkg, &rdep) == EPKG_OK) {
 			pkg_emit_required(pkg, flags & PKG_DELETE_FORCE);
 			if ((flags & PKG_DELETE_FORCE) == 0)
 				return (EPKG_REQUIRED);
 		}
 	}
 	/*

modified pkg/event.c

@@ -226,12 +226,12 @@ event_callback(void *data, struct pkg_event *ev)

 				    pkg_new, pkg_new, pkg_old);
 				break;
 			case PKG_REINSTALL:
 				pkg_sbuf_printf(msg, "Reinstalling %n-%V...",
 				pkg_sbuf_printf(msg, "Reinstalling %n-%v...",
 				    pkg_old, pkg_old);
 				break;
 			case PKG_UPGRADE:
 				pkg_sbuf_printf(msg,
 				    "Upgrading %n from %V to %v...",
 				    "Upgrading %n from %v to %v...",
 						pkg_old, pkg_old, pkg_new);
 				break;
 			}