Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8f1235f
Update utilities for lock API.
Vsevolod Stakhov committed 11 years ago
commit 8f1235fa61a28a8cbc6871bdae0ff0d383a6e80f
parent 9d111d7
22 files changed +29 -29
modified src/add.c
@@ -132,7 +132,7 @@ exec_add(int argc, char **argv)
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an exclusive lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/annotate.c
@@ -298,7 +298,7 @@ exec_annotate(int argc, char **argv)
		return (EX_IOERR);

	}
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an exclusive lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/audit.c
@@ -176,7 +176,7 @@ exec_audit(int argc, char **argv)
		if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

			return (EX_IOERR);
- 
		if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
		if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

			pkgdb_close(db);

			warnx("Cannot get a read lock on a database, it is locked by another process");

			return (EX_TEMPFAIL);
modified src/autoremove.c
@@ -101,7 +101,7 @@ exec_autoremove(__unused int argc, __unused char **argv)
		return (EX_IOERR);

	}
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/check.c
@@ -149,7 +149,7 @@ fix_deps(struct pkgdb *db, struct deps_head *dh, int nbpkgs, bool yes)
		return (EPKG_ENODB);

	}
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
@@ -354,7 +354,7 @@ exec_check(int argc, char **argv)
	if (ret != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
@@ -386,7 +386,7 @@ exec_check(int argc, char **argv)
			}

			if (recompute) {

				if (pkgdb_upgrade_lock(db, PKGDB_LOCK_ADVISORY,
- 
						PKGDB_LOCK_EXCLUSIVE, 0.5, 20) == EPKG_OK) {
+ 
						PKGDB_LOCK_EXCLUSIVE) == EPKG_OK) {

					if (verbose)

						pkg_printf("Recomputing size and checksums: %n\n", pkg);

					if (pkg_recompute(db, pkg) != EPKG_OK) {
@@ -400,7 +400,7 @@ exec_check(int argc, char **argv)
			}

			if (reanalyse_shlibs) {

				if (pkgdb_upgrade_lock(db, PKGDB_LOCK_ADVISORY,
- 
						PKGDB_LOCK_EXCLUSIVE, 0.5, 20) == EPKG_OK) {
+ 
						PKGDB_LOCK_EXCLUSIVE) == EPKG_OK) {

					if (verbose)

						pkg_printf("Reanalyzing files for shlibs: %n\n", pkg);

					if (pkgdb_reanalyse_shlibs(db, pkg) != EPKG_OK) {
@@ -419,7 +419,7 @@ exec_check(int argc, char **argv)
			printf("\n>>> Missing package dependencies were detected.\n");

			printf(">>> Found %d issue(s) in the package database.\n\n", nbpkgs);

			if (pkgdb_upgrade_lock(db, PKGDB_LOCK_ADVISORY,
- 
					PKGDB_LOCK_EXCLUSIVE, 0.5, 20) == EPKG_OK) {
+ 
					PKGDB_LOCK_EXCLUSIVE) == EPKG_OK) {

				ret = fix_deps(db, &dh, nbpkgs, yes);

				if (ret == EPKG_OK)

					check_summary(db, &dh);
modified src/clean.c
@@ -222,7 +222,7 @@ exec_clean(int argc, char **argv)
	if (pkgdb_open(&db, PKGDB_REMOTE) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/convert.c
@@ -72,7 +72,7 @@ convert_to_old(const char *pkg_add_dbdir, bool dry_run)
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an exclusive lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/create.c
@@ -91,7 +91,7 @@ pkg_create_matches(int argc, char **argv, match_t match, pkg_formats fmt,
		return (EX_IOERR);

	}

	/* XXX: get rid of hardcoded timeouts */
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/delete.c
@@ -139,7 +139,7 @@ exec_delete(int argc, char **argv)
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_ADVISORY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/fetch.c
@@ -160,7 +160,7 @@ exec_fetch(int argc, char **argv)
	if (pkgdb_open_all(&db, PKGDB_REMOTE, reponame) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/info.c
@@ -273,7 +273,7 @@ exec_info(int argc, char **argv)
	if (ret != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/install.c
@@ -190,7 +190,7 @@ exec_install(int argc, char **argv)
	    reponame) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, lock_type, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, lock_type) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/lock.c
@@ -117,7 +117,7 @@ list_locked()
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
@@ -227,7 +227,7 @@ exec_lock_unlock(int argc, char **argv, enum action action)
	if (retcode != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an exclusive lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/query.c
@@ -941,7 +941,7 @@ exec_query(int argc, char **argv)
	if (ret != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/register.c
@@ -298,7 +298,7 @@ exec_register(int argc, char **argv)
		if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

			return (EX_IOERR);
- 
		if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
		if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

			pkgdb_close(db);

			warnx("Cannot get an exclusive lock on a database, it is locked by another process");

			return (EX_TEMPFAIL);
modified src/set.c
@@ -157,7 +157,7 @@ exec_set(int argc, char **argv)
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_EXCLUSIVE) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an exclusive lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/shlib.c
@@ -177,7 +177,7 @@ exec_shlib(int argc, char **argv)
	if (retcode != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/stats.c
@@ -82,7 +82,7 @@ exec_stats(__unused int argc, __unused char **argv)
		return (EX_IOERR);

	}
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/updating.c
@@ -107,7 +107,7 @@ exec_updating(int argc, char **argv)
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/upgrade.c
@@ -143,7 +143,7 @@ exec_upgrade(int argc, char **argv)
	if (pkgdb_open_all(&db, PKGDB_REMOTE, reponame) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, lock_type, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, lock_type) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get an advisory lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);
modified src/version.c
@@ -385,7 +385,7 @@ do_source_index(unsigned int opt, char limchar, char *pattern, match_t match,


	indexhead = hash_indexfile(indexfile);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		free_index(indexhead);

		warnx("Cannot get a read lock on the database. "
@@ -454,7 +454,7 @@ do_source_remote(unsigned int opt, char limchar, char *pattern, match_t match,
	if (pkgdb_open_all(&db, PKGDB_REMOTE, reponame) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database. "

		      "It is locked by another process");
@@ -619,7 +619,7 @@ do_source_ports(unsigned int opt, char limchar, char *pattern, match_t match,
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)

		return (EX_IOERR);
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database. "

		      "It is locked by another process");
modified src/which.c
@@ -96,7 +96,7 @@ exec_which(int argc, char **argv)
		return (EX_IOERR);

	}
- 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY, 0, 0) != EPKG_OK) {
+ 
	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {

		pkgdb_close(db);

		warnx("Cannot get a read lock on a database, it is locked by another process");

		return (EX_TEMPFAIL);