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

libxbps: API/ABI break changes to fix issues with virtual packages.

Browse Source 
Please see the NEWS file for info about this commit.
This commit is contained in:
Juan RP
2011-07-15 18:22:58 +02:00
parent fddb472dd0
commit 33d6d2e166
11 changed files with 198 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction_sortdeps.c
View File

@ -70,7 +70,7 @@ pkgdep_find(const char *name, const char *trans)
}
if (pd->d == NULL)
continue;
if (xbps_find_virtual_pkg_in_dict(pd->d, name, false))
if (xbps_match_virtual_pkg_in_dict(pd->d, name, false))
return pd;
}
@ -93,7 +93,7 @@ pkgdep_find_idx(const char *name, const char *trans)
}
if (pd->d == NULL)
continue;
if (xbps_find_virtual_pkg_in_dict(pd->d, name, false))
if (xbps_match_virtual_pkg_in_dict(pd->d, name, false))
return idx;
idx++;
@ -231,6 +231,10 @@ again:
}
curpkgd = xbps_find_pkg_in_dict_by_name(transd,
"unsorted_deps", pkgnamedep);
if (curpkgd == NULL) {
curpkgd = xbps_find_virtualpkg_in_dict_by_name(transd,
"unsorted_deps", pkgnamedep);
}
if (curpkgd == NULL) {
free(pkgnamedep);
rv = EINVAL;