30db1d3 Merge branch 'master' of github.com:pkgng/pkgng — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

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

Baptiste Daroussin committed 15 years ago

commit 30db1d35fab72015f1edc4604399634bdfab734d
parent 342ccfd

1 file changed +7 -3

modified libpkg/pkg_repo.c

@@ -182,6 +182,7 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *

 	if (sqlite3_exec(sqlite, "COMMIT;", NULL, NULL, &errmsg) != SQLITE_OK)
 		retcode = pkg_error_set(EPKG_FATAL, "%s", errmsg);
 	cleanup:
 	if (fts != NULL)
 		fts_close(fts);

@@ -197,11 +198,14 @@ pkg_create_repo(char *path, void (progress)(struct pkg *pkg, void *data), void *

 	if (sqlite != NULL)
 		sqlite3_close(sqlite);
 	sha256_file(repodb, sum);
 	cleanup:
 	if (errmsg != NULL)
 		sqlite3_free(errmsg);
 	if (retcode == EPKG_OK)
 		/* TODO: error checking */
 		sha256_file(repodb, sum);
 	else
 		sum[0] = '\0';
 	return (retcode);
 }