Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 00e6bf0
Do not count the lock owner as lock blocker.
Vsevolod Stakhov committed 12 years ago
commit 00e6bf0d6ba4b0015874addeb1b8bf87a11843cb
parent 6208cb8
1 file changed +10 -8
modified libpkg/pkgdb.c
@@ -4242,15 +4242,17 @@ pkgdb_check_lock_pid(struct pkgdb *db)


	while (sqlite3_step(stmt) != SQLITE_DONE) {

		pid = sqlite3_column_int64(stmt, 0);
- 
		if (pid != lpid && kill((pid_t)pid, 0) == -1) {
- 
			pkg_debug(1, "found stale pid %lld in lock database", pid);
- 
			if (pkgdb_remove_lock_pid(db, pid) != EPKG_OK){
- 
				sqlite3_finalize(stmt);
- 
				return (EPKG_FATAL);
+ 
		if (pid != lpid) {
+ 
			if (kill((pid_t)pid, 0) == -1) {
+ 
				pkg_debug(1, "found stale pid %lld in lock database", pid);
+ 
				if (pkgdb_remove_lock_pid(db, pid) != EPKG_OK){
+ 
					sqlite3_finalize(stmt);
+ 
					return (EPKG_FATAL);
+ 
				}
+ 
			}
+ 
			else {
+ 
				found ++;

			}
- 
		}
- 
		else {
- 
			found ++;

		}

	}