lib: add xbps flag to enable using staged remote repositories

Author: Duncaen

data/xbps.d.5

@@ -121,6 +121,8 @@ example:
 .El
 .It Sy rootdir=path
 Sets the default root directory.
+.It Sy staged=true|false
+Enables or disables the use of staged packages in remote repositories.
 .It Sy syslog=true|false
 Enables or disables syslog logging. Enabled by default.
 .It Sy virtualpkg=[vpkgname|vpkgver]:pkgname

include/xbps.h.in

@@ -244,6 +244,13 @@
  */
 #define XBPS_FLAG_KEEP_CONFIG 		0x00010000
 
+/**
+ * @def XBPS_FLAG_USE_STAGE
+ * Use the staging repository if available.
+ * Must be set through the xbps_handle::flags member.
+ */
+#define XBPS_FLAG_USE_STAGE 		0x00020000
+
 /**
  * @def XBPS_FETCH_CACHECONN
  * Default (global) limit of cached connections used in libfetch.

lib/conf.c

@@ -210,6 +210,7 @@ enum {
 	KEY_PRESERVE,
 	KEY_REPOSITORY,
 	KEY_ROOTDIR,
+	KEY_STAGING,
 	KEY_SYSLOG,
 	KEY_VIRTUALPKG,
 	KEY_KEEPCONF,
@@ -230,6 +231,7 @@ static const struct key {
 	{ "preserve",      8, KEY_PRESERVE },
 	{ "repository",   10, KEY_REPOSITORY },
 	{ "rootdir",       7, KEY_ROOTDIR },
+	{ "staging",       7, KEY_STAGING },
 	{ "syslog",        6, KEY_SYSLOG },
 	{ "virtualpkg",   10, KEY_VIRTUALPKG },
 };
@@ -390,6 +392,15 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 			xbps_dbg_printf("%s: native architecture set to %s\n", path,
 			    val);
 			break;
+		case KEY_STAGING:
+			if (strcasecmp(val, "true") == 0) {
+				xhp->flags |= XBPS_FLAG_USE_STAGE;
+				xbps_dbg_printf("%s: repository stage enabled\n", path);
+			} else {
+				xhp->flags &= ~XBPS_FLAG_USE_STAGE;
+				xbps_dbg_printf("%s: repository stage disabled\n", path);
+			}
+			break;
 		case KEY_SYSLOG:
 			if (strcasecmp(val, "true") == 0) {
 				xhp->flags &= ~XBPS_FLAG_DISABLE_SYSLOG;

lib/initend.c

@@ -164,6 +164,14 @@ xbps_init(struct xbps_handle *xhp)
 			xhp->flags |= XBPS_FLAG_DISABLE_SYSLOG;
 	}
 
+	p = getenv("XBPS_STAGING");
+	if (p) {
+		if (strcasecmp(p, "true") == 0)
+			xhp->flags &= ~XBPS_FLAG_USE_STAGE;
+		else if (strcasecmp(p, "false") == 0)
+			xhp->flags |= XBPS_FLAG_USE_STAGE;
+	}
+
 	if (xhp->flags & XBPS_FLAG_DEBUG) {
 		const char *repodir;
 		for (unsigned int i = 0; i < xbps_array_count(xhp->repositories); i++) {

lib/repo.c

@@ -508,15 +508,13 @@ xbps_repo_open(struct xbps_handle *xhp, const char *url)
 		return NULL;
 	}
 
-	if (repo->is_remote || xbps_dictionary_count(repo->stage) == 0) {
+	if (xbps_dictionary_count(repo->stage) == 0 ||
+	    (repo->is_remote && !(xhp->flags & XBPS_FLAG_USE_STAGE))) {
 		repo->idx = repo->index;
 		xbps_object_retain(repo->idx);
 		return repo;
 	}
 
-	/*
-	 * Load and merge staging repository if the repository is local.
-	 */
 	r = repo_merge_stage(repo);
 	if (r < 0) {
 		xbps_error_printf(