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

libxbps: fixed xbps_remove_pkg_from_array_by_{name,pattern,pkgver}.

Browse Source 
The correct index wasn't being passed to prop_array_remove.
This commit is contained in:
Juan RP 2012-06-01 10:53:28 +02:00
parent 65b5e328d8
commit 652e9afcef
2 changed files with 10 additions and 4 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 "20120531" #define XBPS_API_VERSION "20120601"
#define XBPS_VERSION "0.16" #define XBPS_VERSION "0.16"
/** /**

12
lib/plist_remove.c
View File

@ -79,8 +79,10 @@ remove_obj_from_array(prop_array_t array, const char *str, int mode,
/* match by pkgname, obj is a dictionary */ /* match by pkgname, obj is a dictionary */
chkarch = prop_dictionary_get_cstring_nocopy(obj, chkarch = prop_dictionary_get_cstring_nocopy(obj,
"architecture", &arch); "architecture", &arch);
if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) {
idx++;
continue; continue;
}
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgname", &curname); "pkgname", &curname);
if (strcmp(curname, str) == 0) { if (strcmp(curname, str) == 0) {
@ -90,8 +92,10 @@ remove_obj_from_array(prop_array_t array, const char *str, int mode,
} else if (mode == 3) { } else if (mode == 3) {
chkarch = prop_dictionary_get_cstring_nocopy(obj, chkarch = prop_dictionary_get_cstring_nocopy(obj,
"architecture", &arch); "architecture", &arch);
if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) {
idx++;
continue; continue;
}
/* match by pkgver, obj is a dictionary */ /* match by pkgver, obj is a dictionary */
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgver", &curname); "pkgver", &curname);
@ -102,8 +106,10 @@ remove_obj_from_array(prop_array_t array, const char *str, int mode,
} else if (mode == 4) { } else if (mode == 4) {
chkarch = prop_dictionary_get_cstring_nocopy(obj, chkarch = prop_dictionary_get_cstring_nocopy(obj,
"architecture", &arch); "architecture", &arch);
if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) if (chkarch && !xbps_pkg_arch_match(arch, targetarch)) {
idx++;
continue; continue;
}
/* match by pattern, obj is a dictionary */ /* match by pattern, obj is a dictionary */
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgver", &curname); "pkgver", &curname);