libxbps: modify xbps_get_binpkg_repo_uri() to accept repository URL as 2nd arg.

This commit is contained in:
Juan RP
2011-01-20 16:41:49 +01:00
parent 6f8b2ca33a
commit 84b578b0e4
7 changed files with 22 additions and 20 deletions

View File

@ -71,7 +71,7 @@ static int
find_files_in_package(struct repository_pool_index *rpi, void *arg, bool *done)
{
prop_dictionary_t pkg_filesd;
prop_array_t repo_pkgs, files_keys;
prop_array_t files_keys;
prop_object_t obj;
prop_object_iterator_t iter;
const char *pkgname, *pkgver, *pattern = arg;
@ -81,17 +81,13 @@ find_files_in_package(struct repository_pool_index *rpi, void *arg, bool *done)
(void)done;
repo_pkgs = prop_dictionary_get(rpi->rpi_repod, "packages");
if (repo_pkgs == NULL)
return -1;
iter = prop_array_iterator(repo_pkgs);
iter = xbps_get_array_iter_from_dict(rpi->rpi_repod, "packages");
if (iter == NULL)
return -1;
printf("Looking in repository '%s', please wait...\n", rpi->rpi_uri);
while ((obj = prop_object_iterator_next(iter))) {
url = xbps_get_binpkg_repo_uri(obj);
url = xbps_get_binpkg_repo_uri(obj, rpi->rpi_uri);
if (url == NULL) {
rv = -1;
break;