b83824d pkg-convert -r: Only a readonly lock is required for converting from the db — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg-convert -r: Only a readonly lock is required for converting from the db

Bryan Drewery committed 11 years ago

commit b83824db37e4a5e1a5eb9518e2b6827ffb73e8ea
parent ae4d0a4

1 file changed +2 -2

modified src/convert.c

@@ -75,7 +75,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) != EPKG_OK) {
 	if (pkgdb_obtain_lock(db, PKGDB_LOCK_READONLY) != EPKG_OK) {
 		pkgdb_close(db);
 		warnx("Cannot get an exclusive lock on a database, it is locked by another process");
 		return (EX_TEMPFAIL);

@@ -225,7 +225,7 @@ convert_to_old(const char *pkg_add_dbdir, bool dry_run)

 cleanup:
 	pkg_free(pkg);
 	pkgdb_it_free(it);
 	pkgdb_release_lock(db, PKGDB_LOCK_EXCLUSIVE);
 	pkgdb_release_lock(db, PKGDB_LOCK_READONLY);
 	pkgdb_close(db);
 	return (ret);