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

xbps-repo: use xbps_repository_pool_find_pkg().

Browse Source
This commit is contained in:
Juan RP 2011-01-18 14:57:25 +01:00
parent 503afdd48d
commit 8e0a94d5cc
1 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
bin/xbps-repo/repository.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2010 Juan Romero Pardines. * Copyright (c) 2008-2011 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -238,63 +238,36 @@ out:
return rv; return rv;
} }
static int int
repo_show_pkg_info_cb(struct repository_pool_index *rpi, void *arg, bool *done) show_pkg_info_from_repolist(const char *pkgname)
{ {
prop_dictionary_t repo_pkgd, pkg_propsd; prop_dictionary_t pkgd, pkg_propsd;
const char *pkgname = arg; const char *repoloc;
char *url = NULL; char *url = NULL;
repo_pkgd = xbps_find_pkg_in_dict_by_name(rpi->rpi_repod, pkgd = xbps_repository_pool_find_pkg(pkgname, false, false);
"packages", pkgname); if (pkgd == NULL)
if (repo_pkgd == NULL)
return errno; return errno;
url = xbps_repository_get_path_from_pkg_dict(repo_pkgd, rpi->rpi_uri); prop_dictionary_get_cstring_nocopy(pkgd, "repository", &repoloc);
if (url == NULL) url = xbps_repository_get_path_from_pkg_dict(pkgd, repoloc);
if (url == NULL) {
prop_object_release(pkgd);
return errno; return errno;
}
printf("Fetching info from: %s\n", rpi->rpi_uri); printf("Fetching info from: %s\n", repoloc);
pkg_propsd = pkg_propsd =
xbps_repository_get_pkg_plist_dict_from_url(url, XBPS_PKGPROPS); xbps_repository_get_pkg_plist_dict_from_url(url, XBPS_PKGPROPS);
if (pkg_propsd == NULL) { if (pkg_propsd == NULL) {
free(url); free(url);
prop_object_release(pkgd);
return errno; return errno;
} }
free(url); free(url);
show_pkg_info_only_repo(repo_pkgd); show_pkg_info_only_repo(pkgd);
show_pkg_info(pkg_propsd); show_pkg_info(pkg_propsd);
prop_object_release(pkg_propsd); prop_object_release(pkg_propsd);
*done = true; prop_object_release(pkgd);
return 0;
}
int
show_pkg_info_from_repolist(const char *pkgname)
{
return xbps_repository_pool_foreach(repo_show_pkg_info_cb,
__UNCONST(pkgname));
}
static int
repo_show_pkg_deps_cb(struct repository_pool_index *rpi, void *arg, bool *done)
{
prop_dictionary_t pkgd;
const char *ver, *pkgname = arg;
pkgd = xbps_find_pkg_in_dict_by_name(rpi->rpi_repod,
"packages", pkgname);
if (pkgd == NULL) {
if (errno && errno != ENOENT)
return errno;
return 0;
}
prop_dictionary_get_cstring_nocopy(pkgd, "version", &ver);
printf("Repository %s [pkgver: %s]\n", rpi->rpi_uri, ver);
(void)xbps_callback_array_iter_in_dict(pkgd,
"run_depends", list_strings_sep_in_array, NULL);
*done = true;
return 0; return 0;
} }
@ -302,8 +275,22 @@ repo_show_pkg_deps_cb(struct repository_pool_index *rpi, void *arg, bool *done)
int int
show_pkg_deps_from_repolist(const char *pkgname) show_pkg_deps_from_repolist(const char *pkgname)
{ {
return xbps_repository_pool_foreach(repo_show_pkg_deps_cb, prop_dictionary_t pkgd;
__UNCONST(pkgname)); const char *ver, *repoloc;
pkgd = xbps_repository_pool_find_pkg(pkgname, false, false);
if (pkgd == NULL)
return errno;
prop_dictionary_get_cstring_nocopy(pkgd, "version", &ver);
prop_dictionary_get_cstring_nocopy(pkgd, "repository", &repoloc);
printf("Repository %s [pkgver: %s]\n", repoloc, ver);
(void)xbps_callback_array_iter_in_dict(pkgd,
"run_depends", list_strings_sep_in_array, NULL);
prop_object_release(pkgd);
return 0;
} }
static int static int