1018f16 new pkgdb_register_ports() — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

new pkgdb_register_ports()

Baptiste Daroussin committed 14 years ago

commit 1018f1683d770b29eecfc253fe7d1690f3210280
parent 71c7407

4 files changed +20 -8

modified libpkg/pkg.h

@@ -621,15 +621,11 @@ int pkgdb_dump(struct pkgdb *db, char *dest);

 int pkgdb_load(struct pkgdb *db, char *dest);
 /**
  * Register a package to the database.
  * Register a ports to the database.
  * @return An error code.
  */
 int pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete);
 /**
  * Commit or rollback the package to the database..
  */
 int pkgdb_register_finale(struct pkgdb *db, int retcode);
 int pkgdb_register_ports(struct pkgdb *db, struct pkg *pkg);
 /**
  * Unregister a package from the database.

modified libpkg/pkgdb.c

@@ -1882,6 +1882,20 @@ pkgdb_register_finale(struct pkgdb *db, int retcode)

 }
 int
 pkgdb_register_ports(struct pkgdb *db, struct pkg *pkg)
 {
 	int ret;
 	pkg_emit_install_begin(pkg);
 	ret = pkgdb_register_pkg(db, pkg, 0);
 	if (ret == EPKG_OK)
 		pkg_emit_install_finished(pkg);
 	pkgdb_register_finale(db, ret);
 	return (ret);
 }
 int
 pkgdb_unregister_pkg(struct pkgdb *db, const char *origin)
 {
 	sqlite3_stmt *stmt_del;

modified libpkg/private/pkg.h

@@ -262,4 +262,7 @@ int pkgdb_load_user(struct pkgdb *db, struct pkg *pkg);

 int pkgdb_load_group(struct pkgdb *db, struct pkg *pkg);
 int pkgdb_load_shlib(struct pkgdb *db, struct pkg *pkg);
 int pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete);
 int pkgdb_register_finale(struct pkgdb *db, int retcode);
 #endif

modified pkg/register.c

@@ -213,8 +213,7 @@ exec_register(int argc, char **argv)

 		free(input_path);
 	}
 	retcode = pkgdb_register_pkg(db, pkg, 0);
 	pkgdb_register_finale(db, retcode);
 	retcode = pkgdb_register_ports(db, pkg);
 	pkg_get(pkg, PKG_MESSAGE, &message);
 	if (message != NULL && !legacy)