jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

db: fix repository write locking

cute-signatures
Timo Teras 2009-07-24 14:12:59 +03:00
parent 8e66768cd2
commit 195859b3fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/database.c
View File

@ -872,6 +872,7 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags)
}
if (db->lock_fd < 0 ||
flock(db->lock_fd, LOCK_EX | LOCK_NB) < 0) {
msg = "Unable to lock database";
if (apk_wait) {
struct sigaction sa, old_sa;
@ -882,14 +883,13 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags)
sigaction(SIGALRM, &sa, &old_sa);
alarm(apk_wait);
if (flock(db->lock_fd, LOCK_EX) < 0) {
msg = "Unable to lock database";
if (flock(db->lock_fd, LOCK_EX) < 0)
goto ret_errno;
}
alarm(0);
sigaction(SIGALRM, &old_sa, NULL);
}
} else
goto ret_errno;
}
}
}