xbps: revert 0e46d29f4.

Need to investigate the issue with more time.

srcpkgs/xbps-static/template

@@ -2,7 +2,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.54
-revision=4
+revision=5
 # only musl
 archs="*-musl"
 wrksrc="xbps-${version}"

srcpkgs/xbps/patches/288cff37f8da02d29f054c736896432a4addfc5c.patch

@@ -1,61 +0,0 @@
-commit 288cff37f8da02d29f054c736896432a4addfc5c
-Author: Juan RP <xtraeme@gmail.com>
-Date:   Fri Jun 21 11:06:45 2019 +0200
-
-    xbps-install: return 0 if pkg is already installed or uptodate.
-    
-    Before this change xbps-install could return EEXIST
-    when the package is already installed, or already up-to-date.
-    
-    Return 0 if such condition happens, and only return EEXIST
-    if there's a file conflict.
-    
-    Close #51
-
-diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c
-index 30033218..bba6337d 100644
---- bin/xbps-install/main.c
-+++ bin/xbps-install/main.c
-@@ -239,11 +239,11 @@ main(int argc, char **argv)
- 		rv = dist_upgrade(&xh, maxcols, yes, drun);
- 	} else if (update) {
- 		/* Update target packages */
--		int npkgs = argc - optind;
- 		for (i = optind; i < argc; i++) {
- 			rv = update_pkg(&xh, argv[i]);
--			if (npkgs >= 2 && rv == EEXIST) {
--				;
-+			if (rv == EEXIST) {
-+				/* pkg already updated, ignore */
-+				rv = 0;
- 			} else if (rv != 0) {
- 				xbps_end(&xh);
- 				exit(rv);
-@@ -252,11 +252,11 @@ main(int argc, char **argv)
- 		rv = exec_transaction(&xh, maxcols, yes, drun);
- 	} else if (!update) {
- 		/* Install target packages */
--		int npkgs = argc - optind;
- 		for (i = optind; i < argc; i++) {
- 			rv = install_new_pkg(&xh, argv[i], reinstall);
--			if (npkgs >= 2 && rv == EEXIST) {
--				;
-+			if (rv == EEXIST) {
-+				/* pkg already installed, ignore */
-+				rv = 0;
- 			} else if (rv != 0) {
- 				xbps_end(&xh);
- 				exit(rv);
-diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c
-index 2601b845..a397f59d 100644
---- bin/xbps-install/transaction.c
-+++ bin/xbps-install/transaction.c
-@@ -389,6 +389,8 @@ exec_transaction(struct xbps_handle *xhp, int maxcols, bool yes, bool drun)
- 		    trans->dl_pkgcnt, trans->inst_pkgcnt,
- 		    trans->up_pkgcnt, trans->cf_pkgcnt + trans->inst_pkgcnt,
- 		    trans->rm_pkgcnt);
-+	} else {
-+		fprintf(stderr, "Transaction failed! see above for errors.\n");
- 	}
- out:
- 	if (trans->iter)

srcpkgs/xbps/template

@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.54
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"