dbf65bc Fix types when set automatic flag. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix types when set automatic flag.

Vsevolod Stakhov committed 13 years ago

commit dbf65bce5b23bdf47f7634fb24907e1e6508f3ac
parent e0e9aec

2 files changed +2 -4

modified libpkg/pkg_add.c

@@ -193,7 +193,7 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags)

 	}
 	if (flags & PKG_ADD_AUTOMATIC)
 		pkg_set(pkg, PKG_AUTOMATIC, true);
 		pkg_set(pkg, PKG_AUTOMATIC, (int64_t)true);
 	/*
 	 * Check the architecture

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

 		}
 		else {
 			pkg_emit_notice("package %s is already installed, forced install", name);
 			/* We need to upgrade package, so set appropriate flag */
 			flags |= PKG_ADD_UPGRADE;
 			pkg_free(pkg_inst);
 		}
 	} else if (ret != EPKG_END) {

modified libpkg/pkgdb.c

@@ -2731,7 +2731,7 @@ sql_exec(sqlite3 *s, const char *sql, ...)

 	}
 	if (sqlite3_exec(s, sql_to_exec, NULL, NULL, &errmsg) != SQLITE_OK) {
 		pkg_emit_error("sqlite: %s", errmsg);
 		ERROR_SQLITE(s);
 		sqlite3_free(errmsg);
 		goto cleanup;
 	}