b68bc1d Fix logic breaking pkg_* tables being populated on register — HardenedBSD-pkg

HardenedBSD Package Manager

Fix logic breaking pkg_* tables being populated on register

Bryan Drewery committed 13 years ago

commit b68bc1d8981ffa7d27862398f9eca669a632825f
parent c52ebc395e607f85c03085b2ff32763fc5ccd2eb

1 file changed +5 -5

modified libpkg/pkgdb.c

@@ -1866,7 +1866,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	while (pkg_categories(pkg, &category) == EPKG_OK) {
 		if (run_prstmt(CATEGORY1, pkg_category_name(category))
 		    != SQLITE_DONE
 		    &&
 		    ||
 		    run_prstmt(CATEGORY2, package_id, pkg_category_name(category))
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s);

@@ -1881,7 +1881,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	while (pkg_licenses(pkg, &license) == EPKG_OK) {
 		if (run_prstmt(LICENSES1, pkg_license_name(license))
 		    != SQLITE_DONE
 		    &&
 		    ||
 		    run_prstmt(LICENSES2, package_id, pkg_license_name(license))
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s);

@@ -1896,7 +1896,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	while (pkg_users(pkg, &user) == EPKG_OK) {
 		if (run_prstmt(USERS1, pkg_user_name(user))
 		    != SQLITE_DONE
 		    &&
 		    ||
 		    run_prstmt(USERS2, package_id, pkg_user_name(user))
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s);

@@ -1911,7 +1911,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	while (pkg_groups(pkg, &group) == EPKG_OK) {
 		if (run_prstmt(GROUPS1, pkg_group_name(group))
 		    != SQLITE_DONE
 		    &&
 		    ||
 		    run_prstmt(GROUPS2, package_id, pkg_group_name(group))
 		    != SQLITE_DONE)
 		{

@@ -1954,7 +1954,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	while (pkg_shlibs(pkg, &shlib) == EPKG_OK) {
 		if (run_prstmt(SHLIBS1, pkg_shlib_name(shlib))
 		    != SQLITE_DONE
 		    &&
 		    ||
 		    run_prstmt(SHLIBS2, package_id, pkg_shlib_name(shlib))
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s);