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

Repository index 1.4 -- see NEWS file for info.

Browse Source
This commit is contained in:
Juan RP
2012-01-19 12:26:40 +01:00
parent 9147488b19
commit 9a088937b5
13 changed files with 118 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/repository_pool_find.c
View File

@@ -54,12 +54,12 @@ repo_find_virtualpkg_cb(struct repository_pool_index *rpi, void *arg, bool *done
if (rpf->bypattern) {
rpf->pkgd =
xbps_find_virtualpkg_conf_in_dict_by_pattern(rpi->rpi_repod,
"packages", rpf->pattern);
xbps_find_virtualpkg_conf_in_array_by_pattern(rpi->rpi_repo,
rpf->pattern);
} else {
rpf->pkgd =
xbps_find_virtualpkg_conf_in_dict_by_name(rpi->rpi_repod,
"packages", rpf->pattern);
xbps_find_virtualpkg_conf_in_array_by_name(rpi->rpi_repo,
rpf->pattern);
}
if (rpf->pkgd) {
#ifdef DEBUG
@@ -88,25 +88,25 @@ repo_find_pkg_cb(struct repository_pool_index *rpi, void *arg, bool *done)
return 0;
}
/* exact match by pkgver */
rpf->pkgd = xbps_find_pkg_in_dict_by_pkgver(rpi->rpi_repod,
"packages", rpf->pattern);
rpf->pkgd = xbps_find_pkg_in_array_by_pkgver(rpi->rpi_repo,
rpf->pattern);
} else if (rpf->bypattern) {
/* match by pkgpattern in pkgver*/
rpf->pkgd = xbps_find_pkg_in_dict_by_pattern(rpi->rpi_repod,
"packages", rpf->pattern);
rpf->pkgd = xbps_find_pkg_in_array_by_pattern(rpi->rpi_repo,
rpf->pattern);
/* If no pkg exists matching pattern, look for virtual packages */
if (rpf->pkgd == NULL) {
rpf->pkgd = xbps_find_virtualpkg_in_dict_by_pattern(
rpi->rpi_repod, "packages", rpf->pattern);
rpf->pkgd = xbps_find_virtualpkg_in_array_by_pattern(
rpi->rpi_repo, rpf->pattern);
}
} else {
/* match by pkgname */
rpf->pkgd = xbps_find_pkg_in_dict_by_name(rpi->rpi_repod,
"packages", rpf->pattern);
rpf->pkgd = xbps_find_pkg_in_array_by_name(rpi->rpi_repo,
rpf->pattern);
/* If no pkg exists matching pattern, look for virtual packages */
if (rpf->pkgd == NULL) {
rpf->pkgd = xbps_find_virtualpkg_in_dict_by_name(
rpi->rpi_repod, "packages", rpf->pattern);
rpf->pkgd = xbps_find_virtualpkg_in_array_by_name(
rpi->rpi_repo, rpf->pattern);
}
}
if (rpf->pkgd) {
@@ -136,11 +136,11 @@ repo_find_best_pkg_cb(struct repository_pool_index *rpi,
(void)done;
if (rpf->bypattern) {
rpf->pkgd = xbps_find_pkg_in_dict_by_pattern(rpi->rpi_repod,
"packages", rpf->pattern);
rpf->pkgd = xbps_find_pkg_in_array_by_pattern(rpi->rpi_repo,
rpf->pattern);
} else {
rpf->pkgd = xbps_find_pkg_in_dict_by_name(rpi->rpi_repod,
"packages", rpf->pattern);
rpf->pkgd = xbps_find_pkg_in_array_by_name(rpi->rpi_repo,
rpf->pattern);
}
if (rpf->pkgd == NULL) {
if (errno && errno != ENOENT)