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

xbps-rindex: redo the clean mode in two passes as it was intended in previous commit.

Browse Source
This commit is contained in:
Juan RP
2013-11-25 10:45:05 +01:00
parent 172c84040c
commit d2f2796c85
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
bin/xbps-rindex/index-clean.c
View File

@ -82,25 +82,20 @@ idx_cleaner_cb(struct xbps_handle *xhp,
} }
static int static int
idxfiles_cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, idxfiles_cleaner_cb(struct xbps_handle *xhp _unused, xbps_object_t obj _unused,
const char *key _unused, void *arg, bool *done _unused) const char *key, void *arg, bool *done _unused)
{ {
xbps_dictionary_t pkg; xbps_dictionary_t pkg;
struct cbdata *cbd = arg; struct cbdata *cbd = arg;
char *pkgname; char *pkgname;
const char *arch, *pkgver, *idxpkgver; const char *pkgver;
/* Find out entries on index-files that aren't registered on index */ /* Find out entries on index-files that aren't registered on index */
xbps_dictionary_get_cstring_nocopy(obj, "architecture", &arch); pkgname = xbps_pkg_name(key);
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
xbps_dbg_printf(xhp, "%s: checking %s [%s] ...", pkgver, arch);
pkgname = xbps_pkg_name(pkgver);
assert(pkgname); assert(pkgname);
if ((pkg = xbps_dictionary_get(cbd->idx, pkgname))) { if ((pkg = xbps_dictionary_get(cbd->idx, pkgname))) {
xbps_dictionary_get_cstring_nocopy(pkg, "pkgver", &idxpkgver); xbps_dictionary_get_cstring_nocopy(pkg, "pkgver", &pkgver);
if (strcmp(idxpkgver, pkgver)) if (strcmp(pkgver, key))
xbps_array_add_cstring_nocopy(cbd->result, pkgver); xbps_array_add_cstring_nocopy(cbd->result, pkgver);
} }
free(pkgname); free(pkgname);
@ -147,28 +142,32 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
cbd.result = xbps_array_create(); cbd.result = xbps_array_create();
allkeys = xbps_dictionary_all_keys(idx); allkeys = xbps_dictionary_all_keys(idx);
rv = xbps_array_foreach_cb_multi(xhp, allkeys, idx, idx_cleaner_cb, &cbd); rv = xbps_array_foreach_cb_multi(xhp, allkeys, idx, idx_cleaner_cb, &cbd);
/*
* Second pass: find out obsolete entries on index-files.
*/
cbd.idx = idx;
xbps_object_release(allkeys);
allkeys = xbps_dictionary_all_keys(idxfiles);
rv = xbps_array_foreach_cb_multi(xhp, allkeys, idx, idxfiles_cleaner_cb, &cbd);
/*
* Finally remove entries from both dictionaries.
*/
for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) { for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) {
xbps_array_get_cstring_nocopy(cbd.result, x, &keyname); xbps_array_get_cstring_nocopy(cbd.result, x, &keyname);
printf("index-files: removed entry %s\n", keyname); printf("index-files: removed entry %s\n", keyname);
xbps_dictionary_remove(idxfiles, keyname); xbps_dictionary_remove(idxfiles, keyname);
pkgname = xbps_pkg_name(keyname); pkgname = xbps_pkg_name(keyname);
xbps_dictionary_remove(idx, pkgname); xbps_dictionary_remove(idx, pkgname);
printf("index: removed entry %s\n", pkgname); printf("index: removed entry %s\n", keyname);
free(pkgname); free(pkgname);
flush = true; flush = true;
} }
/*
* Second pass: find out obsolete entries on index-files.
*/
xbps_object_release(cbd.result);
xbps_object_release(allkeys);
cbd.idx = idx;
cbd.result = xbps_array_create();
allkeys = xbps_dictionary_all_keys(idxfiles);
rv = xbps_array_foreach_cb_multi(xhp, allkeys, idxfiles, idxfiles_cleaner_cb, &cbd);
for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) {
xbps_array_get_cstring_nocopy(cbd.result, x, &keyname);
printf("index-files: removed entry %s\n", keyname);
xbps_dictionary_remove(idxfiles, keyname);
flush = true;
}
xbps_object_release(cbd.result); xbps_object_release(cbd.result);
xbps_object_release(allkeys); xbps_object_release(allkeys);