e27b4ca Merge branch 'master' of github.com:wca/pkgng — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'master' of github.com:wca/pkgng

Will Andrews committed 14 years ago

commit e27b4cad422a04c6d3a4483ec0633fe3bbda26c3
parent 98def53

3 files changed +5 -5

modified libpkg/packing.c

@@ -93,7 +93,7 @@ packing_append_file(struct packing *pack, const char *filepath, const char *newp

 	retcode = archive_read_disk_entry_from_file(pack->aread, pack->entry, -1, NULL);
 	if (retcode != ARCHIVE_OK) {
 		pkg_emit_event(PKG_EVENT_ARCHIVE_ERROR, __DECONST(char *, filepath), (void *)pack->aread);
 		pkg_emit_event(PKG_EVENT_ARCHIVE_ERROR, 2, filepath, pack->aread);
 		retcode = pkg_error_set(EPKG_FATAL,
 								"archive_read_disk_entry_from_file(%s): %s",
 								filepath, archive_error_string(pack->aread));

modified libpkg/pkg.h

@@ -605,9 +605,9 @@ void pkg_handle_set_event_callback(struct pkg_handle *, pkg_event_cb);

 /* XXX maybe the event callback should also get a pointer to the handle, and
  * just drop arg1 altogether..? */
 #define	pkg_emit_event(ev, argc, ...) \
 	__pkg_emit_event(pkg_get_handle(), ev, argc, ...)
 void __pkg_emit_event(struct pkg_handle *, pkg_event_t, int, ...);
 #define	pkg_emit_event(ev, argc, argv...) \
 	__pkg_emit_event(pkg_get_handle(), ev, argc, argv)
 #endif

modified libpkg/pkg_add.c

@@ -161,7 +161,7 @@ pkg_add(struct pkgdb *db, const char *path, struct pkg **pkg_p)

 	if (retcode != EPKG_OK || pkgdb_has_flag(db, PKGDB_FLAG_IN_FLIGHT) == 0)
 		goto cleanup_reg;
 	pkg_emit_event(PKG_EVENT_INSTALL_BEGIN, pkg, NULL);
 	pkg_emit_event(PKG_EVENT_INSTALL_BEGIN, 1, pkg);
 	/*
 	 * Execute pre-install scripts