emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_path_from_repository_uri: do not look for binpkgs in repo arch dirs anymore.

Browse Source
This commit is contained in:
Juan RP 2012-09-30 10:13:06 +02:00
parent 154337ceab
commit 7909f597cb
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xbps_api.h
View File

@ -56,7 +56,7 @@
*/ */
#define XBPS_PKGINDEX_VERSION "1.5" #define XBPS_PKGINDEX_VERSION "1.5"
#define XBPS_API_VERSION "20120714" #define XBPS_API_VERSION "20120930"
#define XBPS_VERSION "0.17" #define XBPS_VERSION "0.17"
/** /**

9
lib/util.c
View File

@ -231,7 +231,7 @@ xbps_path_from_repository_uri(struct xbps_handle *xhp,
prop_dictionary_t pkg_repod, prop_dictionary_t pkg_repod,
const char *repoloc) const char *repoloc)
{ {
const char *filen, *arch; const char *filen;
char *lbinpkg = NULL; char *lbinpkg = NULL;
assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY); assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY);
@ -252,13 +252,10 @@ xbps_path_from_repository_uri(struct xbps_handle *xhp,
return lbinpkg; return lbinpkg;
free(lbinpkg); free(lbinpkg);
if (!prop_dictionary_get_cstring_nocopy(pkg_repod,
"architecture", &arch))
return NULL;
/* /*
* Local and remote repositories use the same path. * 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 bool
@ -315,7 +312,7 @@ xbps_xasprintf(const char *fmt, ...)
int int
xbps_pkgpattern_match(const char *pkg, const char *pattern) 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) if (strcmp(pattern, pkg) == 0)
return 1; return 1;