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

transaction: keep last dep and remove dup matches while sorting deps.

Browse Source 
This bug has been uncovered due to udev -> systemd merge.
This commit is contained in:
Juan RP 2012-10-06 09:21:26 +02:00
parent f8450f9bd7
commit b764f8e19a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/transaction_sortdeps.c
View File

@ -51,6 +51,7 @@ struct pkgdep {
prop_dictionary_t d; prop_dictionary_t d;
char *name; char *name;
const char *trans; const char *trans;
const char *pkgver;
}; };
static TAILQ_HEAD(pkgdep_head, pkgdep) pkgdep_list = static TAILQ_HEAD(pkgdep_head, pkgdep) pkgdep_list =
@ -134,6 +135,8 @@ pkgdep_alloc(prop_dictionary_t d, const char *name, const char *trans)
memcpy(pd->name, name, len-1); memcpy(pd->name, name, len-1);
pd->name[len-1] = '\0'; pd->name[len-1] = '\0';
pd->trans = trans; pd->trans = trans;
if (d != NULL)
prop_dictionary_get_cstring_nocopy(pd->d, "pkgver", &pd->pkgver);
return pd; return pd;
} }
@ -143,12 +146,11 @@ pkgdep_end(struct xbps_handle *xhp, prop_array_t sorted)
{ {
prop_dictionary_t d; prop_dictionary_t d;
struct pkgdep *pd; struct pkgdep *pd;
const char *trans; const char *trans, *pkgver;
while ((pd = TAILQ_FIRST(&pkgdep_list)) != NULL) { while ((pd = TAILQ_FIRST(&pkgdep_list)) != NULL) {
TAILQ_REMOVE(&pkgdep_list, pd, pkgdep_entries); TAILQ_REMOVE(&pkgdep_list, pd, pkgdep_entries);
if (sorted != NULL && pd->d != NULL) { if (pd->d != NULL && pd->pkgver != NULL) {
/* do not add duplicates due to vpkgs */
d = xbps_find_pkg_in_array_by_name(xhp, sorted, d = xbps_find_pkg_in_array_by_name(xhp, sorted,
pd->name, NULL); pd->name, NULL);
if (d == NULL) { if (d == NULL) {
@ -163,9 +165,14 @@ pkgdep_end(struct xbps_handle *xhp, prop_array_t sorted)
} }
prop_dictionary_get_cstring_nocopy(d, prop_dictionary_get_cstring_nocopy(d,
"transaction", &trans); "transaction", &trans);
if (strcmp(trans, pd->trans) == 0) { prop_dictionary_get_cstring_nocopy(d,
pkgdep_release(pd); "pkgver", &pkgver);
continue; if ((strcmp(trans, pd->trans) == 0) &&
(strcmp(pkgver, pd->pkgver) == 0)) {
xbps_dbg_printf(xhp, "[sortdeps] removing dup "
"match '%s %s'\n", pd->pkgver, pd->trans);
xbps_remove_pkg_from_array_by_name(xhp,
sorted, pd->name, NULL);
} }
prop_array_add(sorted, pd->d); prop_array_add(sorted, pd->d);
} }