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

libxbps: separate virtualpkg conf stuff from repository_pool_find_pkg.

Browse Source 
Now to find a virtualpkg set by the user in conf file, there is a new
function: xbps_repository_pool_find_virtualpkg(). Use it in some
places to make jpeg -> libjpeg-turbo (and other pkgs that can be
replaced with other virtual pkgs) work correctly even if installed
multiple times.
This commit is contained in:
Juan RP
2011-10-16 12:22:46 +02:00
parent 104bec27e5
commit 12af2370da
5 changed files with 125 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/repository_pool.c
View File

@ -387,11 +387,10 @@ repo_find_best_pkg_cb(struct repository_pool_index *rpi,
return 0;
}
prop_dictionary_t
xbps_repository_pool_find_pkg(const char *pkg, bool bypattern, bool best)
static struct repo_pool_fpkg *
repo_find_pkg(const char *pkg, bool bypattern, bool best, bool virtual)
{
struct repo_pool_fpkg *rpf;
prop_dictionary_t pkgd = NULL;
int rv = 0;
assert(pkg != NULL);
@ -411,37 +410,57 @@ xbps_repository_pool_find_pkg(const char *pkg, bool bypattern, bool best)
* pattern in all repositories.
*/
rv = xbps_repository_pool_foreach(repo_find_best_pkg_cb, rpf);
if (rv != 0) {
if (rv != 0)
errno = rv;
goto out;
} else if (rpf->pkgfound == false) {
goto out;
}
} else {
/*
* Look for any virtual package set by the user matching
* the package name or pattern.
*/
rv = xbps_repository_pool_foreach(repo_find_virtualpkg_cb, rpf);
if (rv != 0) {
errno = rv;
goto out;
} else if (rpf->pkgfound == false) {
if (virtual) {
/*
* No virtual package found. Look for real package
* names or patterns instead.
* No package found. Look for virtual package
* set by the user or any virtual pkg available.
*/
rv = xbps_repository_pool_foreach(repo_find_virtualpkg_cb, rpf);
if (rv != 0)
errno = rv;
} else {
/*
* Look for a package (non virtual) in repositories.
*/
rv = xbps_repository_pool_foreach(repo_find_pkg_cb, rpf);
if (rv != 0) {
if (rv != 0)
errno = rv;
goto out;
} else if (rpf->pkgfound == false) {
goto out;
}
}
}
pkgd = prop_dictionary_copy(rpf->pkgd);
out:
return rpf;
}
prop_dictionary_t
xbps_repository_pool_find_virtualpkg(const char *pkg, bool bypattern, bool best)
{
struct repo_pool_fpkg *rpf;
prop_dictionary_t pkgd = NULL;
assert(pkg != NULL);
rpf = repo_find_pkg(pkg, bypattern, best, true);
if (rpf->pkgfound && rpf->pkgd != NULL)
pkgd = prop_dictionary_copy(rpf->pkgd);
free(rpf);
return pkgd;
}
prop_dictionary_t
xbps_repository_pool_find_pkg(const char *pkg, bool bypattern, bool best)
{
struct repo_pool_fpkg *rpf;
prop_dictionary_t pkgd = NULL;
assert(pkg != NULL);
rpf = repo_find_pkg(pkg, bypattern, best, false);
if (rpf->pkgfound && rpf->pkgd != NULL)
pkgd = prop_dictionary_copy(rpf->pkgd);
free(rpf);
return pkgd;