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

xbps-rindex(8): in clean mode (-c) also remove entries with unmatched hash.

Browse Source
This commit is contained in:
Juan RP 2012-12-03 11:05:37 +01:00
parent 2e2da80cfc
commit 298072ced3
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,5 +1,8 @@
xbps-0.19 (???): xbps-0.19 (???):
* xbps-rindex(8): in clean mode (-c), entries with unmatched hashes
are now removed from index.
* Added support for dynamic generation of reverse dependencies for * Added support for dynamic generation of reverse dependencies for
installed packages. pkgdb no longer keeps track of them statically. installed packages. pkgdb no longer keeps track of them statically.
A new object must be present in pkgdb for this to work in fast mode, A new object must be present in pkgdb for this to work in fast mode,

44
bin/xbps-rindex/index.c
View File

@ -43,10 +43,11 @@
int int
index_clean(struct xbps_handle *xhp, const char *repodir) index_clean(struct xbps_handle *xhp, const char *repodir)
{ {
prop_array_t array, result = NULL; prop_array_t result = NULL;
prop_object_t obj;
prop_object_iterator_t iter;
prop_dictionary_t idx, idxfiles, pkgd; prop_dictionary_t idx, idxfiles, pkgd;
prop_dictionary_keysym_t ksym; const char *filen, *pkgver, *arch, *keyname, *sha256;
const char *filen, *pkgver, *arch, *keyname;
char *plist, *plistf; char *plist, *plistf;
size_t i; size_t i;
int rv = 0; int rv = 0;
@ -88,12 +89,15 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
} }
printf("Cleaning `%s' index, please wait...\n", repodir); printf("Cleaning `%s' index, please wait...\n", repodir);
array = prop_dictionary_all_keys(idx); iter = prop_dictionary_iterator(idx);
for (i = 0; i < prop_array_count(array); i++) { while ((obj = prop_object_iterator_next(iter))) {
ksym = prop_array_get(array, i); pkgd = prop_dictionary_get_keysym(idx, obj);
pkgd = prop_dictionary_get_keysym(idx, ksym);
prop_dictionary_get_cstring_nocopy(pkgd, "filename", &filen); prop_dictionary_get_cstring_nocopy(pkgd, "filename", &filen);
if (access(filen, R_OK) == -1) { if (access(filen, R_OK) == -1) {
/*
* File cannot be read, might be permissions,
* broken or simply unexistent; either way, remove it.
*/
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
@ -103,12 +107,32 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
if (result == NULL) if (result == NULL)
result = prop_array_create(); result = prop_array_create();
keyname = prop_dictionary_keysym_cstring_nocopy(ksym); keyname = prop_dictionary_keysym_cstring_nocopy(obj);
prop_array_add_cstring(result, keyname); prop_array_add_cstring_nocopy(result, keyname);
flush = true;
}
/*
* File can be read; check its hash.
*/
prop_dictionary_get_cstring_nocopy(pkgd,
"filename-sha256", &sha256);
rv = xbps_file_hash_check(filen, sha256);
if (rv != 0) {
prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(pkgd,
"architecture", &arch);
printf("index: removed entry `%s' due to "
"unmatched hash (%s)\n", pkgver, arch);
if (result == NULL)
result = prop_array_create();
keyname = prop_dictionary_keysym_cstring_nocopy(obj);
prop_array_add_cstring_nocopy(result, keyname);
flush = true; flush = true;
} }
} }
prop_object_release(array); prop_object_iterator_release(iter);
if (flush) { if (flush) {
for (i = 0; i < prop_array_count(result); i++) { for (i = 0; i < prop_array_count(result); i++) {