Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 294566f
Improve events output.
Vsevolod Stakhov committed 12 years ago
commit 294566feb99e65d80fdcf0211fe59200c7e0709d
parent 3b6d846
5 files changed +13 -7
modified libpkg/pkg.h.in
@@ -1512,6 +1512,9 @@ struct pkg_event {
			struct pkg_event_conflict *conflicts;

		} e_integrity_conflict;

		struct {
+ 
			int conflicting;
+ 
		} e_integrity_finished;
+ 
		struct {

			int updated;

			int removed;

			int added;
modified libpkg/pkg_event.c
@@ -163,7 +163,8 @@ pipeevent(struct pkg_event *ev)
		break;

	case PKG_EVENT_INTEGRITYCHECK_FINISHED:

		sbuf_printf(msg, "{ \"type\": \"INFO_INTEGRITYCHECK_FINISHED\", "
- 
		    "\"data\": {}}");
+ 
		    "\"data\": {\"conflicting\": %d}}",
+ 
		    ev->e_integrity_finished.conflicting);

		break;

	case PKG_EVENT_DEINSTALL_BEGIN:

		pkg_sbuf_printf(msg, "{ \"type\": \"INFO_DEINSTALL_BEGIN\", "
@@ -470,10 +471,11 @@ pkg_emit_integritycheck_begin(void)
}



void
- 
pkg_emit_integritycheck_finished(void)
+ 
pkg_emit_integritycheck_finished(int conflicting)

{

	struct pkg_event ev;

	ev.type = PKG_EVENT_INTEGRITYCHECK_FINISHED;
+ 
	ev.e_integrity_finished.conflicting = conflicting;



	pkg_emit_event(&ev);

}
modified libpkg/pkg_jobs.c
@@ -1762,12 +1762,12 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)
	if (added > 0) {

		pkg_debug(1, "check integrity for %d items added", added);

		if ((res = pkg_conflicts_integrity_check(j)) != EPKG_OK) {
- 
			pkg_emit_integritycheck_finished();
+ 
			pkg_emit_integritycheck_finished(j->conflicts_registered);

			return (res);

		}

	}
- 
	pkg_emit_integritycheck_finished();
+ 
	pkg_emit_integritycheck_finished(j->conflicts_registered);



	return (ret);

}
modified libpkg/private/event.h
@@ -44,7 +44,7 @@ void pkg_emit_missing_dep(struct pkg *p, struct pkg_dep *d);
void pkg_emit_locked(struct pkg *p);

void pkg_emit_required(struct pkg *p, int force);

void pkg_emit_integritycheck_begin(void);
- 
void pkg_emit_integritycheck_finished(void);
+ 
void pkg_emit_integritycheck_finished(int);

void pkg_emit_integritycheck_conflict(const char *name, const char *version,

		const char *origin, const char *path, struct pkg_event_conflict *conflicts);

void pkg_emit_noremotedb(const char *);
modified src/event.c
@@ -149,7 +149,7 @@ event_callback(void *data, struct pkg_event *ev)
	case PKG_EVENT_INTEGRITYCHECK_FINISHED:

		if (quiet)

			break;
- 
		printf(" done\n");
+ 
		printf(" done (%d conflicting)\n", ev->e_integrity_finished.conflicting);

		break;

	case PKG_EVENT_INTEGRITYCHECK_CONFLICT:

		if (*debug == 0)
@@ -270,7 +270,8 @@ event_callback(void *data, struct pkg_event *ev)
		if (quiet)

			break;

		pkg = ev->e_already_installed.pkg;
- 
		pkg_printf("%n-%v already installed\n", pkg, pkg);
+ 
		pkg_printf("the most recent version of %n-%v is already installed\n",
+ 
				pkg, pkg);

		break;

	case PKG_EVENT_NOT_FOUND:

		printf("Package '%s' was not found in "