Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 913f461
pkg update: Rework output slightly to make it more clear what is happening
Bryan Drewery committed 11 years ago
commit 913f46197884b89fe3b7699e4589c83bf35de507
parent 2560537
6 files changed +21 -18
modified libpkg/pkg.h.in
@@ -1515,6 +1515,7 @@ struct pkg_event {
			int conflicting;

		} e_integrity_finished;

		struct {
+ 
			const char *reponame;

			int updated;

			int removed;

			int added;
modified libpkg/pkg_event.c
@@ -326,11 +326,13 @@ pipeevent(struct pkg_event *ev)
	case PKG_EVENT_INCREMENTAL_UPDATE:

		sbuf_printf(msg, "{ \"type\": \"INFO_INCREMENTAL_UPDATE\", "

		    "\"data\": {"
+ 
		        "\"name\": \"%s\", "

			"\"updated\": %d, "

			"\"removed\": %d, "

			"\"added\": %d, "

			"\"processed\": %d"
- 
			"}}", ev->e_incremental_update.updated,
+ 
			"}}", 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);
@@ -794,11 +796,13 @@ pkg_emit_package_not_found(const char *p)
}



void
- 
pkg_emit_incremental_update(int updated, int removed, int added, int processed)
+ 
pkg_emit_incremental_update(const char *reponame, int updated, int removed,
+ 
    int added, 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;
modified libpkg/private/event.h
@@ -56,7 +56,8 @@ 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(int updated, int removed, int added, int processed);
+ 
void pkg_emit_incremental_update(const char *reponame, int updated, int removed,
+ 
    int added, 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
@@ -759,7 +759,7 @@ pkg_repo_binary_update_incremental(const char *name, struct pkg_repo *repo,


	removed = HASH_COUNT(ldel);

	hash_it = 0;
- 
	pkg_emit_progress_start("Removing expired entries");
+ 
	pkg_emit_progress_start("Removing expired repository entries");

	HASH_ITER(hh, ldel, item, tmp_item) {

		pkg_emit_progress_tick(++hash_it, removed);

		if (rc == EPKG_OK) {
@@ -789,7 +789,7 @@ pkg_repo_binary_update_incremental(const char *name, struct pkg_repo *repo,


	hash_it = 0;

	pushed = HASH_COUNT(ladd);
- 
	pkg_emit_progress_start("Adding new entries");
+ 
	pkg_emit_progress_start("Processing new repository entries");

	HASH_ITER(hh, ladd, item, tmp_item) {

		pkg_emit_progress_tick(++hash_it, pushed);

		if (rc == EPKG_OK) {
@@ -814,7 +814,8 @@ pkg_repo_binary_update_incremental(const char *name, struct pkg_repo *repo,
	pkg_manifest_keys_free(keys);



	if (rc == EPKG_OK)
- 
		pkg_emit_incremental_update(updated, removed, added, processed);
+ 
		pkg_emit_incremental_update(repo->name, updated, removed,
+ 
		    added, processed);



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

	case PKG_EVENT_INCREMENTAL_UPDATE:

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

			    ev->e_incremental_update.processed,

			    ev->e_incremental_update.updated,

			    ev->e_incremental_update.removed,
modified src/update.c
@@ -56,14 +56,6 @@ pkgcli_update(bool force, bool strict, const char *reponame)
	    PKGDB_DB_REPO) == EPKG_ENOACCESS)

		return (EPKG_OK);
- 
	if (!quiet) {
- 
		if (reponame != NULL)
- 
			printf("Updating \"%s\" repository catalogue...\n",
- 
			    reponame);
- 
		else
- 
			printf("Updating repository catalogue...\n");
- 
	}
- 


	if (pkg_repos_total_count() == 0) {

		fprintf(stderr, "No valid repository found.\n");

		return (EPKG_FATAL);
@@ -78,10 +70,14 @@ pkgcli_update(bool force, bool strict, const char *reponame)
				continue;

		}
+ 
		if (!quiet)
+ 
			printf("Updating %s repository catalogue...\n",
+ 
			    pkg_repo_name(r));

		retcode = pkg_update(r, force);

		if (retcode == EPKG_UPTODATE) {

			if (!quiet)
- 
				printf("%s repository is up-to-date.\n", pkg_repo_name(r));
+ 
				printf("%s repository is up-to-date.\n",
+ 
				    pkg_repo_name(r));

		}

		else if (retcode != EPKG_OK && strict)

			retcode = EPKG_FATAL;