From 7909f597cb6945f886901c58f8c2344ee498daf4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 30 Sep 2012 10:13:06 +0200
Subject: [PATCH] xbps_path_from_repository_uri: do not look for binpkgs in
 repo arch dirs anymore.

---
 include/xbps_api.h | 2 +-
 lib/util.c         | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/xbps_api.h b/include/xbps_api.h
index c7b03842..bb94e68d 100644
--- a/include/xbps_api.h
+++ b/include/xbps_api.h
@@ -56,7 +56,7 @@
  */
 #define XBPS_PKGINDEX_VERSION	"1.5"
 
-#define XBPS_API_VERSION	"20120714"
+#define XBPS_API_VERSION	"20120930"
 #define XBPS_VERSION		"0.17"
 
 /**
diff --git a/lib/util.c b/lib/util.c
index 2ce1c7ba..e1b63f2e 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -231,7 +231,7 @@ xbps_path_from_repository_uri(struct xbps_handle *xhp,
 			      prop_dictionary_t pkg_repod,
 			      const char *repoloc)
 {
-	const char *filen, *arch;
+	const char *filen;
 	char *lbinpkg = NULL;
 
 	assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY);
@@ -252,13 +252,10 @@ xbps_path_from_repository_uri(struct xbps_handle *xhp,
 		return lbinpkg;
 
 	free(lbinpkg);
-	if (!prop_dictionary_get_cstring_nocopy(pkg_repod,
-	    "architecture", &arch))
-		return NULL;
 	/*
 	 * 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
@@ -315,7 +312,7 @@ xbps_xasprintf(const char *fmt, ...)
 int
 xbps_pkgpattern_match(const char *pkg, const char *pattern)
 {
-	/* simple match on "pkg" against "pattern */
+	/* simple match on "pkg" against "pattern" */
 	if (strcmp(pattern, pkg) == 0)
 		return 1;