b919286 Report about locked packages. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Report about locked packages.

Vsevolod Stakhov committed 11 years ago

commit b919286d9a337d3e9339de7c384467be47817081
parent b364ce3

3 files changed +8 -8

modified libpkg/pkg_jobs.c

@@ -1432,8 +1432,10 @@ pkg_need_upgrade(struct pkg *rp, struct pkg *lp, bool recursive)

 	const ucl_object_t *an, *obj;
 	/* Do not upgrade locked packages */
 	if (pkg_is_locked(lp))
 	if (pkg_is_locked(lp)) {
 		pkg_emit_locked(lp);
 		return (false);
 	}
 	pkg_get(lp, PKG_VERSION, &lversion, PKG_ARCH, &larch, PKG_ORIGIN, &origin,
 			PKG_DIGEST, &ldigest);

modified src/event.c

@@ -644,15 +644,11 @@ event_callback(void *data, struct pkg_event *ev)

 		break;
 	case PKG_EVENT_LOCKED:
 		pkg = ev->e_locked.pkg;
 		pkg_fprintf(stderr,
 		    "\n%n-%v is locked and may not be modified\n",
 		    pkg, pkg);
 		pkg_printf("\n%n-%v is locked and may not be modified\n", pkg, pkg);
 		break;
 	case PKG_EVENT_REQUIRED:
 		pkg = ev->e_required.pkg;
 		pkg_fprintf(stderr,
 		    "\n%n-%v is required by: %r%{%rn-%rv%| %}",
 		    pkg, pkg, pkg);
 		pkg_printf("\n%n-%v is required by: %r%{%rn-%rv%| %}", pkg, pkg, pkg);
 		if (ev->e_required.force == 1)
 			fprintf(stderr, ", deleting anyway\n");
 		else

modified src/utils.c

@@ -688,8 +688,9 @@ set_jobs_summary_pkg(struct pkg_jobs *jobs,

 	it->solved_type = type;
 	if (old_pkg != NULL && pkg_is_locked(old_pkg)) {
 		pkg_printf("\tPackage %n-%v is locked ", old_pkg, old_pkg);
 		it->display_type = PKG_DISPLAY_LOCKED;
 		DL_APPEND(disp[it->display_type], it);
 		return;
 	}
 	destdir = pkg_jobs_destdir(jobs);

@@ -882,6 +883,7 @@ print_jobs_summary(struct pkg_jobs *jobs, const char *msg, ...)

 				va_start(ap, msg);
 				vprintf(msg, ap);
 				va_end(ap);
 				fflush(stdout);
 				msg = NULL;
 			}
 			printf("%s:\n", pkg_display_messages[type]);