ea23c76 Do not increment lock count if we couldn't lock db — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Do not increment lock count if we couldn't lock db

Vsevolod Stakhov committed 13 years ago

commit ea23c7642aadb5f7e08c562827b374a4f5fc5620
parent a4c3f58

1 file changed +9 -2

modified libpkg/pkgdb.c

@@ -4351,11 +4351,18 @@ pkgshell_open(const char **reponame)

 int
 pkgdb_obtain_lock(struct pkgdb *db)
 {
 	int ret;
 	assert(db != NULL);
 	assert(db->lock_count >= 0);
 	if (!(db->lock_count++))
 		return sql_exec(db->sqlite,
 	if (!db->lock_count) {
 		ret = sql_exec(db->sqlite,
 		    "PRAGMA main.locking_mode=EXCLUSIVE;BEGIN IMMEDIATE;COMMIT;");
 		/* Set lock only if we actually were able to switch locking mode */
 		if (ret == EPKG_OK)
 			++db->lock_count;
 		return (ret);
 	}
 	else
 		return (EPKG_OK);
 }