Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › e3c0cc9
Print processed packages.
Vsevolod Stakhov committed 13 years ago
commit e3c0cc927368c7d0676023689ff9c8415653a8a9
parent 9d8e63e
5 files changed +14 -7
modified libpkg/pkg.h.in
@@ -1268,6 +1268,7 @@ struct pkg_event {
			int updated;

			int removed;

			int added;
+ 
			int processed;

		} e_incremental_update;

	};

};
modified libpkg/pkg_event.c
@@ -352,10 +352,12 @@ pipeevent(struct pkg_event *ev)
		    "\"data\": {"

			"\"updated\": %d, "

			"\"removed\": %d, "
- 
			"\"added\": %d"
+ 
			"\"added\": %d, "
+ 
			"\"processed\": %d"

			"}}", ev->e_incremental_update.updated,

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

		break;

	default:

		break;
@@ -737,7 +739,7 @@ pkg_emit_package_not_found(const char *p)
}



void
- 
pkg_emit_incremental_update(int updated, int removed, int added)
+ 
pkg_emit_incremental_update(int updated, int removed, int added, int processed)

{

	struct pkg_event ev;
@@ -745,6 +747,7 @@ pkg_emit_incremental_update(int updated, int removed, int added)
	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
@@ -52,7 +52,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(int updated, int removed, int added);
+ 
void pkg_emit_incremental_update(int updated, int removed, int added, int processed);





#endif
modified libpkg/update.c
@@ -571,7 +571,7 @@ pkg_update_incremental(const char *name, const char *packagesite, time_t *mtime)
		free(item);

	}

	added -= updated;
- 
	pkg_emit_incremental_update(updated, removed, added);
+ 
	pkg_emit_incremental_update(updated, removed, added, processed);



cleanup:

	if (it != NULL)
modified pkg/event.c
@@ -263,8 +263,11 @@ event_callback(void *data, struct pkg_event *ev)
		break;

	case PKG_EVENT_INCREMENTAL_UPDATE:

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

					ev->e_incremental_update.added);

		break;

	default: