9d111d7 Fix libpkg locking arguments. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix libpkg locking arguments.

Vsevolod Stakhov committed 11 years ago

commit 9d111d790222e78618c3c87e2732627f3316bdba
parent 991a976

2 files changed +2 -2

modified libpkg/pkg_jobs.c

@@ -2021,7 +2021,7 @@ pkg_jobs_execute(struct pkg_jobs *j)

 	/* XXX: get rid of hardcoded values */
 	retcode = pkgdb_upgrade_lock(j->db, PKGDB_LOCK_ADVISORY,
 			PKGDB_LOCK_EXCLUSIVE, 0.5, 20);
 			PKGDB_LOCK_EXCLUSIVE);
 	if (retcode != EPKG_OK)
 		return (retcode);

modified libpkg/pkgdb.c

@@ -4224,7 +4224,7 @@ pkgdb_try_lock(struct pkgdb *db, const char *lock_sql, pkgdb_lock_t type,

 	if (timeout)
 		num_timeout = pkg_object_int(timeout);
 	if (max_tries)
 		num_maxtries = pkg_object_int(num_maxtries);
 		num_maxtries = pkg_object_int(max_tries);
 	while (tries <= num_maxtries) {
 		ret = sqlite3_exec(db->sqlite, lock_sql, NULL, NULL, NULL);