lib,bin: xbps_pkgdb_lock already logs errors

avoid printing another less specific error message.

Author: Duncaen

bin/xbps-alternatives/main.c

@@ -351,7 +351,6 @@ main(int argc, char **argv)
 
 		/* in set mode pkgdb must be locked and flushed on success */
 		if (xbps_pkgdb_lock(&xh) < 0) {
-			xbps_error_printf("failed to lock pkgdb: %s\n", strerror(rv));
 			xbps_end(&xh);
 			exit(EXIT_FAILURE);
 		}

bin/xbps-install/main.c

@@ -238,20 +238,24 @@ main(int argc, char **argv)
 
 	/* Sync remote repository data and import keys from remote repos */
 	if (syncf && !drun) {
-		if ((rv = xbps_rpool_sync(&xh, NULL)) != 0)
-			exit(rv);
+		if ((rv = xbps_rpool_sync(&xh, NULL)) != 0) {
+			xbps_end(&xh);
+			exit(EXIT_FAILURE);
+		}
 		rv = xbps_rpool_foreach(&xh, repo_import_key_cb, NULL);
-		if (rv != 0)
-			exit(rv);
+		if (rv != 0) {
+			xbps_end(&xh);
+			exit(EXIT_FAILURE);
+		}
 	}
 
 	if (syncf && !update && (argc == optind))
 		exit(EXIT_SUCCESS);
 
 	if (!(xh.flags & XBPS_FLAG_DOWNLOAD_ONLY) && !drun) {
-		if ((rv = xbps_pkgdb_lock(&xh)) != 0) {
-			xbps_error_printf("Failed to lock the pkgdb: %s\n", strerror(rv));
-			exit(rv);
+		if (xbps_pkgdb_lock(&xh) < 0) {
+			xbps_end(&xh);
+			exit(EXIT_FAILURE);
 		}
 	}
 

bin/xbps-pkgdb/main.c

@@ -201,10 +201,11 @@ main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	if ((rv = xbps_pkgdb_lock(&xh)) != 0) {
-		xbps_error_printf("failed to lock pkgdb: %s\n", strerror(rv));
+	if (xbps_pkgdb_lock(&xh) < 0) {
+		xbps_end(&xh);
 		exit(EXIT_FAILURE);
 	}
+
 	if (update_format) {
 		/* nothing to do; xbps_pkgdb_lock() runs the conversion for us */
 		goto out;

bin/xbps-reconfigure/main.c

@@ -178,8 +178,8 @@ main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	if ((rv = xbps_pkgdb_lock(&xh)) != 0) {
-		xbps_error_printf("failed to lock pkgdb: %s\n", strerror(rv));
+	if (xbps_pkgdb_lock(&xh) < 0) {
+		xbps_end(&xh);
 		exit(EXIT_FAILURE);
 	}
 

bin/xbps-remove/main.c

@@ -267,13 +267,17 @@ main(int argc, char **argv)
 
 	if (clean_cache > 0) {
 		rv = clean_cachedir(&xh, clean_cache > 1, drun);
-		if (!orphans || rv)
-			exit(rv);;
+		if (rv) {
+			xbps_end(&xh);
+			exit(EXIT_FAILURE);
+		}
+		if (!orphans)
+			exit(EXIT_SUCCESS);
 	}
 
-	if (!drun && (rv = xbps_pkgdb_lock(&xh)) != 0) {
-		xbps_error_printf("failed to lock pkgdb: %s\n", strerror(rv));
-		exit(rv);
+	if (!drun && xbps_pkgdb_lock(&xh) < 0) {
+		xbps_end(&xh);
+		exit(EXIT_FAILURE);
 	}
 
 	if (orphans) {

lib/pkgdb.c

@@ -72,7 +72,7 @@ xbps_pkgdb_lock(struct xbps_handle *xhp)
 
 	if (access(xhp->rootdir, W_OK) == -1 && errno != ENOENT) {
 		return xbps_error_errno(errno,
-		    "failed to check whether the rootdir is writable: "
+		    "failed to check whether the root directory is writable: "
 		    "%s: %s\n",
 		    xhp->rootdir, strerror(errno));
 	}