Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dbccbf6
Adapt use message to the new update system
Baptiste Daroussin committed 11 years ago
commit dbccbf6f076f692ff9fca442da506c99be14d817
parent ca4c763
5 files changed +5 -24
modified libpkg/pkg.h.in
@@ -1382,9 +1382,6 @@ struct pkg_event {
		} e_integrity_finished;

		struct {

			const char *reponame;
- 
			int updated;
- 
			int removed;
- 
			int added;

			int processed;

		} e_incremental_update;

		struct {
modified libpkg/pkg_event.c
@@ -341,14 +341,8 @@ pipeevent(struct pkg_event *ev)
		sbuf_printf(msg, "{ \"type\": \"INFO_INCREMENTAL_UPDATE\", "

		    "\"data\": {"

		        "\"name\": \"%s\", "
- 
			"\"updated\": %d, "
- 
			"\"removed\": %d, "
- 
			"\"added\": %d, "

			"\"processed\": %d"

			"}}", ev->e_incremental_update.reponame,
- 
			ev->e_incremental_update.updated,
- 
			ev->e_incremental_update.removed,
- 
			ev->e_incremental_update.added,

			ev->e_incremental_update.processed);

		break;

	case PKG_EVENT_QUERY_YESNO:
@@ -876,16 +870,12 @@ pkg_emit_package_not_found(const char *p)
}



void
- 
pkg_emit_incremental_update(const char *reponame, int updated, int removed,
- 
    int added, int processed)
+ 
pkg_emit_incremental_update(const char *reponame, int processed)

{

	struct pkg_event ev;



	ev.type = PKG_EVENT_INCREMENTAL_UPDATE;

	ev.e_incremental_update.reponame = reponame;
- 
	ev.e_incremental_update.updated = updated;
- 
	ev.e_incremental_update.removed = removed;
- 
	ev.e_incremental_update.added = added;

	ev.e_incremental_update.processed = processed;



	pkg_emit_event(&ev);
modified libpkg/private/event.h
@@ -56,8 +56,7 @@ void pkg_emit_file_mismatch(struct pkg *pkg, struct pkg_file *f, const char *new
void pkg_emit_newpkgversion(void);

void pkg_emit_developer_mode(const char *fmt, ...);

void pkg_emit_package_not_found(const char *);
- 
void pkg_emit_incremental_update(const char *reponame, int updated, int removed,
- 
    int added, int processed);
+ 
void pkg_emit_incremental_update(const char *reponame, int processed);

void pkg_emit_backup(void);

void pkg_emit_restore(void);

void pkg_debug(int level, const char *fmt, ...);
modified libpkg/repo/binary/update.c
@@ -546,8 +546,7 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,
	}



	if (rc == EPKG_OK)
- 
		pkg_emit_incremental_update(repo->name, 0, 0,
- 
		    0, cnt);
+ 
		pkg_emit_incremental_update(repo->name, cnt);



cleanup:
modified src/event.c
@@ -796,13 +796,9 @@ event_callback(void *data, struct pkg_event *ev)
		break;

	case PKG_EVENT_INCREMENTAL_UPDATE:

		if (!quiet)
- 
			printf("%s repository update completed. %d packages processed:\n"
- 
			    "  %d updated, %d removed and %d added.\n",
+ 
			printf("%s repository update completed. %d packages processed\n",

			    ev->e_incremental_update.reponame,
- 
			    ev->e_incremental_update.processed,
- 
			    ev->e_incremental_update.updated,
- 
			    ev->e_incremental_update.removed,
- 
			    ev->e_incremental_update.added);
+ 
			    ev->e_incremental_update.processed);

		break;

	case PKG_EVENT_DEBUG:

		fprintf(stderr, "DBG(%d)[%d]> %s\n", ev->e_debug.level,