From 897ac238c4d2b7f3c96b811e033bba230f02224b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 20 Mar 2016 21:40:22 +0100 Subject: [PATCH] Revert "xbps-rindex: check for consistent shlibs" This reverts commit 5f4e1ad43ed202751fb7b2aec90dbe031ba5a5f2 which was accidently checked in in the master branch. --- bin/xbps-rindex/index-add.c | 139 +++--------------------------- include/xbps.h.in | 32 ------- lib/repo.c | 167 +++++++++++++----------------------- 3 files changed, 72 insertions(+), 266 deletions(-) diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c index 80c17dde..03ea0d59 100644 --- a/bin/xbps-rindex/index-add.c +++ b/bin/xbps-rindex/index-add.c @@ -54,130 +54,16 @@ set_build_date(const xbps_dictionary_t pkgd, time_t timestamp) return 0; } -static bool -repodata_commit(struct xbps_handle *xhp, const char *repodir, - xbps_dictionary_t idx, xbps_dictionary_t meta, xbps_dictionary_t stage) { - const char *pkgname; - xbps_object_iterator_t iter; - xbps_object_t keysym; - int rv; - - if(xbps_dictionary_count(stage) == 0) { - // Nothing to do. - return true; - } - - /* - * Find old shlibs-provides - */ - xbps_dictionary_t oldshlibs = xbps_dictionary_create(); - xbps_dictionary_t usedshlibs = xbps_dictionary_create(); - - iter = xbps_dictionary_iterator(stage); - while ((keysym = xbps_object_iterator_next(iter))) { - pkgname = xbps_dictionary_keysym_cstring_nocopy(keysym); - xbps_dictionary_t oldpkg = xbps_dictionary_get(idx, pkgname); - - xbps_array_t pkgshlibs = xbps_dictionary_get(oldpkg, "shlib-provides"); - for(unsigned int i = 0; i < xbps_array_count(pkgshlibs); i++) { - const char *shlib = NULL; - xbps_array_get_cstring_nocopy(pkgshlibs, i, &shlib); - xbps_dictionary_set_cstring(oldshlibs, shlib, pkgname); - } - } - xbps_object_iterator_release(iter); - - /* - * throw away all unused shlibs - */ - iter = xbps_dictionary_iterator(idx); - while ((keysym = xbps_object_iterator_next(iter))) { - pkgname = xbps_dictionary_keysym_cstring_nocopy(keysym); - xbps_dictionary_t pkg = xbps_dictionary_get(stage, pkgname); - if(!pkg) - pkg = xbps_dictionary_get_keysym(idx, keysym); - xbps_array_t pkgshlibs = xbps_dictionary_get(pkg, "shlib-requires"); - - for(unsigned int i = 0; i < xbps_array_count(pkgshlibs); i++) { - const char *shlib = NULL, *user = NULL; - xbps_array_get_cstring_nocopy(pkgshlibs, i, &shlib); - xbps_dictionary_get_cstring_nocopy(pkg, shlib, &user); - if(!user) - continue; - xbps_array_t users = xbps_dictionary_get(usedshlibs, shlib); - if(!users) { - users = xbps_array_create(); - xbps_dictionary_set(usedshlibs, shlib, users); - } - xbps_array_add_cstring(users, user); - } - } - xbps_object_iterator_release(iter); - - /* - * purge all packages that are fullfilled by the stage - */ - iter = xbps_dictionary_iterator(stage); - while ((keysym = xbps_object_iterator_next(iter))) { - pkgname = xbps_dictionary_keysym_cstring_nocopy(keysym); - xbps_dictionary_t newpkg = xbps_dictionary_get(idx, pkgname); - - xbps_array_t pkgshlibs = xbps_dictionary_get(newpkg, "shlib-provides"); - for(unsigned int i = 0; i < xbps_array_count(pkgshlibs); i++) { - const char *shlib; - xbps_array_get_cstring_nocopy(pkgshlibs, i, &shlib); - xbps_dictionary_remove(usedshlibs, shlib); - } - } - xbps_object_iterator_release(iter); - - if(xbps_dictionary_count(usedshlibs) != 0) { - puts("Unfullfilled shlibs:"); - iter = xbps_dictionary_iterator(usedshlibs); - while ((keysym = xbps_object_iterator_next(iter))) { - const char *shlib = xbps_dictionary_keysym_cstring_nocopy(keysym), *provider = NULL; - xbps_array_t users = xbps_dictionary_get(usedshlibs, shlib); - xbps_dictionary_get_cstring_nocopy(usedshlibs, shlib, &provider); - - printf(" %s (provided by: %s; used by: ", shlib, provider); - const char *pre = ""; - for(unsigned int i = 0; i < xbps_array_count(users); i++) { - const char *user; - xbps_array_get_cstring_nocopy(users, i, &user); - xbps_dictionary_remove(usedshlibs, shlib); - printf("%s%s",pre, user); - pre = ", "; - } - puts(")"); - } - puts("Changes are commit to stage."); - xbps_object_iterator_release(iter); - // TODO FLUSH STAGE - rv = true; - } - else { - iter = xbps_dictionary_iterator(stage); - while ((keysym = xbps_object_iterator_next(iter))) { - pkgname = xbps_dictionary_keysym_cstring_nocopy(keysym); - xbps_dictionary_t newpkg = xbps_dictionary_get_keysym(stage, keysym); - xbps_dictionary_set(idx, pkgname, newpkg); - } - xbps_object_iterator_release(iter); - rv = repodata_flush(xhp, repodir, idx, meta); - } - xbps_object_release(usedshlibs); - xbps_object_release(oldshlibs); - return rv; -} int index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force) { - xbps_dictionary_t idx, idxmeta, idxstage, binpkgd, curpkgd; + xbps_dictionary_t idx, idxmeta, binpkgd, curpkgd; struct xbps_repo *repo = NULL; struct stat st; char *tmprepodir = NULL, *repodir = NULL, *rlockfname = NULL; int rv = 0, ret = 0, rlockfd = -1; + bool flush = false; assert(argv); /* @@ -193,7 +79,7 @@ index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force rv = -1; goto out; } - repo = xbps_repo_public_open(xhp, repodir); + repo = xbps_repo_open(xhp, repodir); if (repo == NULL && errno != ENOENT) { fprintf(stderr, "xbps-rindex: cannot open/lock repository " "%s: %s\n", repodir, strerror(errno)); @@ -207,8 +93,6 @@ index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force idx = xbps_dictionary_create(); idxmeta = NULL; } - // TODO: load data from stage repository - idxstage = xbps_dictionary_create(); /* * Process all packages specified in argv. */ @@ -242,9 +126,7 @@ index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force * than current registered package, update the index; otherwise * pass to the next one. */ - curpkgd = xbps_dictionary_get(idxstage, pkgname); - if(curpkgd == NULL) - curpkgd = xbps_dictionary_get(idx, pkgname); + curpkgd = xbps_dictionary_get(idx, pkgname); if (curpkgd == NULL) { if (errno && errno != ENOENT) { rv = errno; @@ -338,12 +220,13 @@ index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force /* * Add new pkg dictionary into the index. */ - if (!xbps_dictionary_set(idxstage, pkgname, binpkgd)) { + if (!xbps_dictionary_set(idx, pkgname, binpkgd)) { free(pkgname); free(pkgver); rv = EINVAL; goto out; } + flush = true; printf("index: added `%s' (%s).\n", pkgver, arch); xbps_object_release(binpkgd); free(pkgname); @@ -352,10 +235,12 @@ index_add(struct xbps_handle *xhp, int args, int argmax, char **argv, bool force /* * Generate repository data files. */ - if (!repodata_commit(xhp, repodir, idx, idxmeta, idxstage)) { - fprintf(stderr, "%s: failed to write repodata: %s\n", - _XBPS_RINDEX, strerror(errno)); - goto out; + if (flush) { + if (!repodata_flush(xhp, repodir, idx, idxmeta)) { + fprintf(stderr, "%s: failed to write repodata: %s\n", + _XBPS_RINDEX, strerror(errno)); + goto out; + } } printf("index: %u packages registered.\n", xbps_dictionary_count(idx)); diff --git a/include/xbps.h.in b/include/xbps.h.in index 43ab1d25..a2e41ae2 100644 --- a/include/xbps.h.in +++ b/include/xbps.h.in @@ -1499,26 +1499,6 @@ void xbps_repo_unlock(int lockfd, char *lockfname); */ struct xbps_repo *xbps_repo_open(struct xbps_handle *xhp, const char *url); -/** - * Opens a staging repository and returns a xbps_repo object. - * - * @param[in] xhp Pointer to the xbps_handle struct. - * @param[in] uri Repository URI to match. - * - * @return The matching repository object, NULL otherwise. - */ -struct xbps_repo *xbps_repo_stage_open(struct xbps_handle *xhp, const char *url); - -/** - * Opens a repository and returns a xbps_repo object. - * - * @param[in] xhp Pointer to the xbps_handle struct. - * @param[in] uri Repository URI to match. - * - * @return The matching repository object, NULL otherwise. - */ -struct xbps_repo *xbps_repo_public_open(struct xbps_handle *xhp, const char *url); - /** * Closes a repository object and releases resources. * @@ -1537,18 +1517,6 @@ void xbps_repo_close(struct xbps_repo *repo); */ char *xbps_repo_path(struct xbps_handle *xhp, const char *url); -/** - * - * Returns a heap-allocated string with the repository local path. - * - * @param[in] xhp The xbps_handle object. - * @param[in] url The repository URL to match. - * @param[in] name The repository name (stage or repodata) - * - * @return A heap allocated string that must be free(3)d when it's unneeded. - */ -char *xbps_repo_path_with_name(struct xbps_handle *xhp, const char *url, const char *name); - /** * Remotely fetch repository data and keep it in memory. * diff --git a/lib/repo.c b/lib/repo.c index 96d5bb3e..2ef64033 100644 --- a/lib/repo.c +++ b/lib/repo.c @@ -46,19 +46,12 @@ */ char * xbps_repo_path(struct xbps_handle *xhp, const char *url) -{ - return xbps_repo_path_with_name(xhp, url, "repodata"); -} - -char * -xbps_repo_path_with_name(struct xbps_handle *xhp, const char *url, const char *name) { assert(xhp); assert(url); - assert(strcmp(name, "repodata") == 0 || strcmp(name, "stagedata") == 0); - return xbps_xasprintf("%s/%s-%s", - url, xhp->target_arch ? xhp->target_arch : xhp->native_arch, name); + return xbps_xasprintf("%s/%s-repodata", + url, xhp->target_arch ? xhp->target_arch : xhp->native_arch); } static xbps_dictionary_t @@ -189,72 +182,6 @@ repo_open_remote(struct xbps_repo *repo) return rv; } -static struct xbps_repo * -repo_open_with_type(struct xbps_handle *xhp, const char *url, const char *name) -{ - struct xbps_repo *repo; - const char *arch; - char *repofile; - - assert(xhp); - assert(url); - - if (xhp->target_arch) - arch = xhp->target_arch; - else - arch = xhp->native_arch; - - repo = calloc(1, sizeof(struct xbps_repo)); - assert(repo); - repo->fd = -1; - repo->xhp = xhp; - repo->uri = url; - - if (xbps_repository_is_remote(url)) { - /* remote repository */ - char *rpath; - - if ((rpath = xbps_get_remote_repo_string(url)) == NULL) { - free(repo); - return NULL; - } - repofile = xbps_xasprintf("%s/%s/%s-%s", xhp->metadir, rpath, arch, name); - free(rpath); - repo->is_remote = true; - } else { - /* local repository */ - repofile = xbps_repo_path_with_name(xhp, url, name); - } - /* - * In memory repo sync. - */ - if (repo->is_remote && (xhp->flags & XBPS_FLAG_REPOS_MEMSYNC)) { - if (repo_open_remote(repo)) - return repo; - - goto out; - } - /* - * Open the repository archive. - */ - repo->fd = open(repofile, O_RDONLY|O_CLOEXEC); - if (repo->fd == -1) { - int rv = errno; - xbps_dbg_printf(xhp, "[repo] `%s' open %s %s\n", - repofile, name, strerror(rv)); - goto out; - } - if (repo_open_local(repo, repofile)) { - free(repofile); - return repo; - } - -out: - free(repofile); - xbps_repo_close(repo); - return NULL; -} - bool xbps_repo_store(struct xbps_handle *xhp, const char *repo) { @@ -294,44 +221,70 @@ xbps_repo_store(struct xbps_handle *xhp, const char *repo) return false; } -struct xbps_repo * -xbps_repo_stage_open(struct xbps_handle *xhp, const char *url) -{ - return repo_open_with_type(xhp, url, "stagedata"); -} - -struct xbps_repo * -xbps_repo_public_open(struct xbps_handle *xhp, const char *url) { - return repo_open_with_type(xhp, url, "repodata"); -} - struct xbps_repo * xbps_repo_open(struct xbps_handle *xhp, const char *url) { - struct xbps_repo *repo = xbps_repo_public_open(xhp, url); - struct xbps_repo *stage = NULL; - xbps_dictionary_t idx; - const char *pkgname; - /* - * Load and merge staging repository if the repository is local. - */ - if(!repo->is_remote) { - stage = xbps_repo_stage_open(xhp, url); - if(stage == NULL) - return repo; - idx = xbps_dictionary_copy_mutable(repo->idx); - xbps_object_iterator_t iter = xbps_dictionary_iterator(stage->idx); - for(xbps_object_t o; (o = xbps_object_iterator_next(iter));) { - pkgname = xbps_string_cstring_nocopy(o); - xbps_dictionary_set(idx, pkgname, - xbps_dictionary_get(stage->idx, pkgname)); + struct xbps_repo *repo; + const char *arch; + char *repofile; + + assert(xhp); + assert(url); + + if (xhp->target_arch) + arch = xhp->target_arch; + else + arch = xhp->native_arch; + + repo = calloc(1, sizeof(struct xbps_repo)); + assert(repo); + repo->fd = -1; + repo->xhp = xhp; + repo->uri = url; + + if (xbps_repository_is_remote(url)) { + /* remote repository */ + char *rpath; + + if ((rpath = xbps_get_remote_repo_string(url)) == NULL) { + free(repo); + return NULL; } - xbps_object_iterator_release(iter); - xbps_object_release(repo->idx); - repo->idx = idx; + repofile = xbps_xasprintf("%s/%s/%s-repodata", xhp->metadir, rpath, arch); + free(rpath); + repo->is_remote = true; + } else { + /* local repository */ + repofile = xbps_repo_path(xhp, url); + } + /* + * In memory repo sync. + */ + if (repo->is_remote && (xhp->flags & XBPS_FLAG_REPOS_MEMSYNC)) { + if (repo_open_remote(repo)) + return repo; + + goto out; + } + /* + * Open the repository archive. + */ + repo->fd = open(repofile, O_RDONLY|O_CLOEXEC); + if (repo->fd == -1) { + int rv = errno; + xbps_dbg_printf(xhp, "[repo] `%s' open repodata %s\n", + repofile, strerror(rv)); + goto out; + } + if (repo_open_local(repo, repofile)) { + free(repofile); return repo; } - return repo; + +out: + free(repofile); + xbps_repo_close(repo); + return NULL; } void