From 9281e9625f1a96aaafa3ecae57113819142427fd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Oct 2011 09:28:43 +0200 Subject: [PATCH] libxbps: xbps_pkgpattern_{name,version}: match for dewey and glob patterns. The match code used by libxbps now will only match for dewey patterns and glob patterns (fnmatch). Bumped XBPS_API_VERSION due to changed behaviour. --- include/xbps_api.h | 4 ++-- lib/util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/xbps_api.h b/include/xbps_api.h index a1ceff2f..cb8b0d52 100644 --- a/include/xbps_api.h +++ b/include/xbps_api.h @@ -55,8 +55,8 @@ */ #define XBPS_PKGINDEX_VERSION "1.2" -#define XBPS_API_VERSION "20111020-1" -#define XBPS_VERSION "0.10.0" +#define XBPS_API_VERSION "20111024" +#define XBPS_VERSION "0.11.0" /** * @def XBPS_RELVER diff --git a/lib/util.c b/lib/util.c index 4acec108..12aee456 100644 --- a/lib/util.c +++ b/lib/util.c @@ -172,7 +172,7 @@ xbps_pkgpattern_name(const char *pkg) assert(pkg != NULL); - res = strpbrk(pkg, "><="); + res = strpbrk(pkg, "><-"); if (res == NULL) return NULL; @@ -193,7 +193,7 @@ xbps_pkgpattern_version(const char *pkg) assert(pkg != NULL); - res = strpbrk(pkg, "><="); + res = strpbrk(pkg, "><-"); if (res == NULL) return NULL;