Implemented "New repository scheme and configuration file" from issue 16.

lib/initend.c

@@ -157,7 +157,7 @@ xbps_init(struct xbps_handle *xh)
 	    prop_string_cstring_nocopy(repofile));
 	xbps_dbg_printf("fetch_cache_conn: %zu\n",
 	    fetch_cache_conn);
-	xbps_dbg_printf("fetch_cacche_conn_host: %zu\n",
+	xbps_dbg_printf("fetch_cache_conn_host: %zu\n",
 	    fetch_cache_conn_host);
 	xbps_dbg_printf("fetch_timeout: %zu\n",
 	    xhp->fetch_timeout);

lib/repository_pool.c

@@ -23,6 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/utsname.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -47,11 +48,6 @@ static SIMPLEQ_HEAD(rpool_head, repository_pool) rpool_queue =
 
 static bool repolist_initialized;
 
-#define FETCH_ERROR(x) ((x == FETCH_UNAVAIL) || \
-			(x == FETCH_NETWORK) || \
-			(x == FETCH_ABORT) || \
-			(x == FETCH_TIMEOUT) || \
-			(x == FETCH_DOWN))
 static int
 sync_remote_repo(const char *plist, const char *repourl)
 {
@@ -60,14 +56,36 @@ sync_remote_repo(const char *plist, const char *repourl)
 		return 0;
 
 	/* file not found, fetch it */
-	if (xbps_repository_sync_pkg_index(repourl) == -1) {
-		if (FETCH_ERROR(fetchLastErrCode))
-			return -1;
-	}
+	if (xbps_repository_sync_pkg_index(repourl) == -1)
+		return -1;
 
 	return 0;
 }
-#undef FETCH_ERROR
+
+/*
+ * Returns true if repository URI contains "noarch" or matching architecture
+ * in last component, false otherwise.
+ */
+static bool
+check_repo_arch(const char *uri)
+{
+	struct utsname un;
+	char *p;
+
+	uname(&un);
+	p = strrchr(uri, '/');
+	if (p == NULL)
+		return false;
+	p++;
+	if (*p == '\0')
+		return false;
+	else if (strcmp(p, "noarch") == 0)
+		return true;
+	else if (strcmp(p, un.machine) == 0)
+		return true;
+
+	return false;
+}
 
 int HIDDEN
 xbps_repository_pool_init(void)
@@ -113,20 +131,33 @@ xbps_repository_pool_init(void)
 		if (duprepo)
 			continue;
 
+		ntotal++;
+		/*
+		 * Check if repository doesn't match our architecture.
+		 */
+		if (!check_repo_arch(repouri)) {
+			xbps_dbg_printf("[rpool] `%s' arch not matched, "
+			    "ignoring.\n", repouri);
+			nmissing++;
+			continue;
+		}
 		plist = xbps_pkg_index_plist(repouri);
 		if (plist == NULL) {
 			rv = errno;
 			goto out;
 		}
-		ntotal++;
+		/*
+		 * If it's a remote repository and index file is not available,
+		 * fetch it for the first time.
+		 */
 		if (sync_remote_repo(plist, repouri) == -1) {
 			nmissing++;
 			free(plist);
 			continue;
 		}
 		/*
-		 * Iterate over the repository pool and add the dictionary
-		 * for current repository into the queue.
+		 * Internalize repository's index dictionary and add it
+		 * into the queue.
 		 */
 		rpool = malloc(sizeof(struct repository_pool));
 		if (rpool == NULL) {

lib/repository_sync_index.c

@@ -23,7 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/utsname.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,11 +55,11 @@ xbps_get_remote_repo_string(const char *uri)
 	 * Replace '.' ':' and '/' characters with underscores, so that
 	 * provided URL:
 	 *
-	 * 	http://nocturno.local:8080/blah/xbps/binpkg-repo
+	 * 	http://nocturno.local:8080/repo/x86_64
 	 *
 	 * becomes:
 	 *
-	 * 	http___nocturno_local_8080_blah_xbps_binpkg_repo
+	 * 	http___nocturno_local_8080_repo_x86_64
 	 * 	
 	 */
 	if (url->port != 0)
@@ -92,12 +91,11 @@ xbps_repository_sync_pkg_index(const char *uri)
 	prop_dictionary_t tmpd;
 	struct xbps_handle *xhp;
 	struct url *url = NULL;
-	struct utsname un;
 	struct stat st;
 	const char *fetch_outputdir;
 	char *rpidx, *lrepodir, *uri_fixedp;
 	char *metadir, *tmp_metafile, *lrepofile;
-	int sverrno, rv = 0;
+	int rv = 0;
 	bool only_sync = false;
 
 	assert(uri != NULL);
@@ -108,9 +106,6 @@ xbps_repository_sync_pkg_index(const char *uri)
 	if (!xbps_check_is_repository_uri_remote(uri))
 		return 0;
 
-	if (uname(&un) == -1)
-		return -1;
-
 	if ((url = fetchParseURL(uri)) == NULL)
 		return -1;
 
@@ -119,7 +114,6 @@ xbps_repository_sync_pkg_index(const char *uri)
 		fetchFreeURL(url);
 		return -1;
 	}
-
 	/*
 	 * Create metadir if necessary.
 	 */
@@ -137,7 +131,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 	/*
 	 * Remote repository pkg-index.plist full URL.
 	 */
-	rpidx = xbps_xasprintf("%s/%s/%s", uri, un.machine, XBPS_PKGINDEX);
+	rpidx = xbps_xasprintf("%s/%s", uri, XBPS_PKGINDEX);
 	if (rpidx == NULL) {
 		rv = -1;
 		goto out;
@@ -181,20 +175,13 @@ xbps_repository_sync_pkg_index(const char *uri)
 	 * Download pkg-index.plist file from repository.
 	 */
 	if (xbps_fetch_file(rpidx, fetch_outputdir, true, NULL) == -1) {
-		sverrno = errno;
-		if (fetchLastErrCode)
-			rv = fetchLastErrCode;
-		else
-			rv = sverrno;
-
 		if (xhp->xbps_transaction_err_cb) {
 			xhp->xtcd->state = XBPS_TRANS_STATE_REPOSYNC;
 			xhp->xtcd->repourl = uri;
-			xhp->xtcd->err = rv;
+			xhp->xtcd->err = fetchLastErrCode;
 			xhp->xbps_transaction_err_cb(xhp->xtcd);
 		}
 		rv = -1;
-		errno = sverrno;
 		goto out;
 	}
 	if (only_sync)

lib/util.c

@@ -34,7 +34,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <sys/utsname.h>
 
 #include "config.h"
 #include "xbps_api_impl.h"
@@ -227,24 +226,19 @@ get_pkg_index_remote_plist(const char *uri)
 char *
 xbps_pkg_index_plist(const char *uri)
 {
-	struct utsname un;
-
 	assert(uri != NULL);
 
-	if (uname(&un) == -1)
-		return NULL;
-
 	if (xbps_check_is_repository_uri_remote(uri))
 		return get_pkg_index_remote_plist(uri);
 
-	return xbps_xasprintf("%s/%s/%s", uri, un.machine, XBPS_PKGINDEX);
+	return xbps_xasprintf("%s/%s", uri, XBPS_PKGINDEX);
 }
 
 char *
 xbps_path_from_repository_uri(prop_dictionary_t pkg_repod, const char *repoloc)
 {
 	struct xbps_handle *xhp;
-	const char *filen, *arch;
+	const char *filen;
 	char *lbinpkg = NULL;
 
 	assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY);
@@ -253,9 +247,6 @@ xbps_path_from_repository_uri(prop_dictionary_t pkg_repod, const char *repoloc)
 	if (!prop_dictionary_get_cstring_nocopy(pkg_repod,
 	    "filename", &filen))
 		return NULL;
-	if (!prop_dictionary_get_cstring_nocopy(pkg_repod,
-	    "architecture", &arch))
-		return NULL;
 
 	xhp = xbps_handle_get();
 	/*
@@ -273,7 +264,7 @@ xbps_path_from_repository_uri(prop_dictionary_t pkg_repod, const char *repoloc)
 	/*
 	 * Local and remote repositories use the same path.
 	 */
-	return xbps_xasprintf("%s/%s/%s", repoloc, arch, filen);
+	return xbps_xasprintf("%s/%s", repoloc, filen);
 }
 
 bool