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

libxbps: also match vpkgs in previous commit.

Browse Source
This commit is contained in:
Juan RP 2012-06-14 12:12:05 +02:00
parent 302b216d8d
commit 506625a716
2 changed files with 9 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 "20120614-1" #define XBPS_API_VERSION "20120614-2"
#define XBPS_VERSION "0.16" #define XBPS_VERSION "0.16"
/** /**

5
lib/transaction_sortdeps.c
View File

@ -157,11 +157,16 @@ pkgdep_end(prop_array_t sorted)
/* do not add duplicates due to vpkgs */ /* do not add duplicates due to vpkgs */
d = xbps_find_pkg_in_array_by_name(sorted, d = xbps_find_pkg_in_array_by_name(sorted,
pd->name, NULL); pd->name, NULL);
if (d == NULL) {
/* find a virtual pkg otherwise */
d = xbps_find_virtualpkg_in_array_by_name(
sorted, pd->name);
if (d == NULL) { if (d == NULL) {
prop_array_add(sorted, pd->d); prop_array_add(sorted, pd->d);
pkgdep_release(pd); pkgdep_release(pd);
continue; continue;
} }
}
prop_dictionary_get_cstring_nocopy(d, prop_dictionary_get_cstring_nocopy(d,
"transaction", &trans); "transaction", &trans);
if (strcmp(trans, pd->trans) == 0) { if (strcmp(trans, pd->trans) == 0) {