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

When sorting packages also look for virtual packages.

Browse Source 
A new function xbps_find_virtual_pkg_in_dict() has been made public
to the API to make this find duplicate packages in the transaction
when updating packages.
This commit is contained in:
Juan RP
2011-01-28 20:56:28 +01:00
parent 76a641794b
commit 463d182c49
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/transaction_sortdeps.c
View File

@@ -63,9 +63,14 @@ pkgdep_find(const char *name)
{
struct pkgdep *pd = NULL;
TAILQ_FOREACH(pd, &pkgdep_list, pkgdep_entries)
TAILQ_FOREACH(pd, &pkgdep_list, pkgdep_entries) {
if (strcmp(pd->name, name) == 0)
return pd;
if (pd->d == NULL)
continue;
if (xbps_find_virtual_pkg_in_dict(pd->d, name, false))
return pd;
}
/* not found */
return NULL;
@@ -80,6 +85,10 @@ pkgdep_find_idx(const char *name)
TAILQ_FOREACH(pd, &pkgdep_list, pkgdep_entries) {
if (strcmp(pd->name, name) == 0)
return idx;
if (pd->d == NULL)
continue;
if (xbps_find_virtual_pkg_in_dict(pd->d, name, false))
return idx;
idx++;
}