4d37c07 pkg_event.h should remain private and now is :) — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg_event.h should remain private and now is :)

Baptiste Daroussin committed 14 years ago

commit 4d37c07a6fca344427e5c37d7e1031cf2e2ad445
parent b849642

2 files changed +5 -4

modified libpkg/pkg_add.c

@@ -122,6 +122,8 @@ pkg_add(struct pkgdb *db, const char *path, int flags)

 		retcode = ret;
 		goto cleanup;
 	}
 	if ((flags & PKG_ADD_UPGRADE) == 0)
 		pkg_emit_install_begin(pkg);
 	if (pkg_is_valid(pkg) != EPKG_OK) {
 		pkg_emit_error("the package is not valid");

@@ -255,6 +257,9 @@ pkg_add(struct pkgdb *db, const char *path, int flags)

 	if ((flags & PKG_ADD_UPGRADE) == 0)
 		pkgdb_register_finale(db, retcode);
 	if (retcode == EPKG_OK && (flags & PKG_ADD_UPGRADE) == 0)
 		pkg_emit_install_finished(p);
 	cleanup:
 	if (a != NULL)
 		archive_read_finish(a);

modified pkg/add.c

@@ -12,7 +12,6 @@

 #include <pkg.h>
 #include "add.h"
 #include "pkg_event.h"
 static int
 is_url(const char * const pattern)

@@ -70,7 +69,6 @@ exec_add(int argc, char **argv)

 			file = argv[i];
 		pkg_open(&p, file, NULL);
 		pkg_emit_install_begin(p);
 		if ((retcode = pkg_add(db, file, 0)) != EPKG_OK) {
 			sbuf_cat(failedpkgs, argv[i]);

@@ -78,8 +76,6 @@ exec_add(int argc, char **argv)

 				sbuf_printf(failedpkgs, ", ");
 			failedpkgcount++;
 		}
 		else
 			pkg_emit_install_finished(p);
 	}