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

Don't initialize repository pool via xbps_init, instead in repository_pool public funcs.

Browse Source 
That way we can avoid having to sync all remote repositories for any code
using xbps_init()!
This commit is contained in:
Juan RP 2011-06-22 11:55:02 +02:00
parent 12d488ec47
commit 74ce033d45
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xbps_api.h
View File

@ -259,7 +259,6 @@ struct xbps_handle {
* - Initialize the debug printfs. * - Initialize the debug printfs.
* - Internalize the proplib dictionary in config file. * - Internalize the proplib dictionary in config file.
* - Internalize the regpkgdb dictionary (if available). * - Internalize the regpkgdb dictionary (if available).
* - Initialize the repository pool interface (if available).
* *
* @param[in] xh Pointer to an xbps_handle structure. It's * @param[in] xh Pointer to an xbps_handle structure. It's
* assumed that this pointer is not NULL. * assumed that this pointer is not NULL.

14
lib/initend.c
View File

@ -123,20 +123,6 @@ xbps_init(struct xbps_handle *xh)
xbps_dbg_printf("%s: fetch_timeout: %zu\n", __func__, xbps_dbg_printf("%s: fetch_timeout: %zu\n", __func__,
xhp->fetch_timeout); xhp->fetch_timeout);
/*
* Initialize repository pool.
*/
if ((rv = xbps_repository_pool_init()) != 0) {
if (rv == ENOTSUP) {
xbps_dbg_printf("%s: empty repository list.\n",
__func__);
} else if (rv != ENOENT && rv != ENOTSUP) {
xbps_dbg_printf("%s: couldn't initialize "
"repository pool: %s\n", __func__, strerror(rv));
xbps_end();
return rv;
}
}
/* /*
* Initialize regpkgdb dictionary. * Initialize regpkgdb dictionary.
*/ */

33
lib/repository_pool.c
View File

@ -111,7 +111,7 @@ xbps_repository_pool_init(void)
xbps_printf("Synchronizing package index for " xbps_printf("Synchronizing package index for "
"`%s'...\n", repouri); "`%s'...\n", repouri);
rv = xbps_repository_sync_pkg_index(repouri); rv = xbps_repository_sync_pkg_index(repouri);
if (rv != 0) { if (rv == -1) {
xbps_error_printf("failed to sync `%s'" xbps_error_printf("failed to sync `%s'"
": %s %s\n", ": %s %s\n",
repouri, strerror(errno), repouri, strerror(errno),
@ -225,7 +225,20 @@ xbps_repository_pool_foreach(
bool done = false; bool done = false;
assert(fn != NULL); assert(fn != NULL);
assert(repolist_initialized != false); /*
* Initialize repository pool.
*/
if ((rv = xbps_repository_pool_init()) != 0) {
if (rv == ENOTSUP) {
xbps_dbg_printf("%s: empty repository list.\n",
__func__);
} else if (rv != ENOENT && rv != ENOTSUP) {
xbps_dbg_printf("%s: couldn't initialize "
"repository pool: %s\n", __func__, strerror(rv));
}
xbps_end();
return rv;
}
SIMPLEQ_FOREACH_SAFE(rpool, &rpool_queue, rp_entries, rpool_new) { SIMPLEQ_FOREACH_SAFE(rpool, &rpool_queue, rp_entries, rpool_new) {
rv = (*fn)(rpool->rpi, arg, &done); rv = (*fn)(rpool->rpi, arg, &done);
@ -356,7 +369,20 @@ xbps_repository_pool_find_pkg(const char *pkg, bool bypattern, bool best)
int rv = 0; int rv = 0;
assert(pkg != NULL); assert(pkg != NULL);
assert(repolist_initialized != false); /*
* Initialize repository pool.
*/
if ((rv = xbps_repository_pool_init()) != 0) {
if (rv == ENOTSUP) {
xbps_dbg_printf("%s: empty repository list.\n",
__func__);
} else if (rv != ENOENT && rv != ENOTSUP) {
xbps_dbg_printf("%s: couldn't initialize "
"repository pool: %s\n", __func__, strerror(rv));
}
xbps_end();
return NULL;
}
rpf = calloc(1, sizeof(*rpf)); rpf = calloc(1, sizeof(*rpf));
if (rpf == NULL) if (rpf == NULL)
@ -417,7 +443,6 @@ xbps_repository_pool_dictionary_metadata_plist(const char *pkgname,
assert(pkgname != NULL); assert(pkgname != NULL);
assert(plistf != NULL); assert(plistf != NULL);
assert(repolist_initialized != false);
/* /*
* Iterate over the the repository pool and search for a plist file * Iterate over the the repository pool and search for a plist file