2c4140f Add specific event about conflicts. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add specific event about conflicts.

Vsevolod Stakhov committed 13 years ago

commit 2c4140f7fc93de2ac5c31ce204e3f8a0d38130bc
parent efda89f

1 file changed +9 -0

modified libpkg/pkg.h.in

@@ -36,6 +36,7 @@

 #include <stdarg.h>
 #include <stdbool.h>
 #include <sys/sbuf.h>
 #include <stringlist.h>
 #include <openssl/pem.h>
 /* The expected name of the pkg(1) binary executable. */

@@ -299,6 +300,7 @@ typedef enum _pkg_flags {

 	PKG_FLAG_NOSCRIPT = (1U << 5),
 	PKG_FLAG_PKG_VERSION_TEST = (1U << 6),
 	PKG_FLAG_UPGRADES_FOR_INSTALLED = (1U << 7),
 	PKG_FLAG_SKIP_INSTALL = (1U << 8)
 } pkg_flags;
 typedef enum _pkg_config_key {

@@ -1138,6 +1140,7 @@ typedef enum {

 	PKG_EVENT_FETCHING,
 	PKG_EVENT_INTEGRITYCHECK_BEGIN,
 	PKG_EVENT_INTEGRITYCHECK_FINISHED,
 	PKG_EVENT_INTEGRITYCHECK_CONFLICT,
 	PKG_EVENT_NEWPKGVERSION,
 	PKG_EVENT_NOTICE,
 	/* errors */

@@ -1237,6 +1240,12 @@ struct pkg_event {

 		struct {
 			const char *pkg_name;
 		} e_not_found;
 		struct {
 			const char *pkg_name;
 			const char *pkg_version;
 			const char *pkg_path;
 			StringList *conflicts;
 		} e_integrity_conflict;
 	};
 };