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

xbps-repo: fixed removing multiple entries from index-files.plist.

Browse Source
This commit is contained in:
Juan RP 2012-01-17 12:16:54 +01:00
parent 4fdf675249
commit da5e9f841f
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/xbps-repo/index-files.c
View File

@ -35,6 +35,7 @@
struct index_files_data { struct index_files_data {
prop_dictionary_t idxdict; prop_dictionary_t idxdict;
prop_array_t idxfiles; prop_array_t idxfiles;
prop_array_t obsoletes;
const char *pkgdir; const char *pkgdir;
bool flush; bool flush;
bool new; bool new;
@ -44,32 +45,25 @@ static int
rmobsoletes_files_cb(prop_object_t obj, void *arg, bool *done) rmobsoletes_files_cb(prop_object_t obj, void *arg, bool *done)
{ {
prop_array_t array; prop_array_t array;
prop_string_t ps;
struct index_files_data *ifd = arg; struct index_files_data *ifd = arg;
const char *pkgver; const char *pkgver;
char *buf;
(void)done; (void)done;
prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
buf = strdup(pkgver);
if (buf == NULL)
return ENOMEM;
array = prop_dictionary_get(ifd->idxdict, "packages"); array = prop_dictionary_get(ifd->idxdict, "packages");
if (xbps_find_pkg_in_array_by_pkgver(array, pkgver)) { if (xbps_find_pkg_in_array_by_pkgver(array, pkgver)) {
/* pkg found, do nothing */ /* pkg found, do nothing */
free(buf);
return 0; return 0;
} }
/* remove obsolete pkg dictionary */ ps = prop_string_create_cstring(pkgver);
if (!xbps_remove_pkg_from_array_by_pkgver(ifd->idxfiles, pkgver)) { if (ps == NULL)
free(buf); return EINVAL;
if (!xbps_add_obj_to_array(ifd->obsoletes, ps))
return EINVAL; return EINVAL;
}
printf("Removed obsolete entry for `%s'.\n", buf);
free(buf);
ifd->flush = true;
ifd->flush = true;
return 0; return 0;
} }
@ -203,6 +197,8 @@ repo_genindex_files(const char *pkgdir)
{ {
prop_dictionary_t idxdict; prop_dictionary_t idxdict;
struct index_files_data *ifd = NULL; struct index_files_data *ifd = NULL;
size_t idx;
const char *pkgver;
char *plist; char *plist;
int rv; int rv;
@ -232,6 +228,7 @@ repo_genindex_files(const char *pkgdir)
ifd->pkgdir = pkgdir; ifd->pkgdir = pkgdir;
ifd->idxfiles = prop_array_internalize_from_zfile(plist); ifd->idxfiles = prop_array_internalize_from_zfile(plist);
ifd->idxdict = prop_dictionary_copy(idxdict); ifd->idxdict = prop_dictionary_copy(idxdict);
ifd->obsoletes = prop_array_create();
if (ifd->idxfiles == NULL) { if (ifd->idxfiles == NULL) {
/* missing file, create new one */ /* missing file, create new one */
ifd->idxfiles = prop_array_create(); ifd->idxfiles = prop_array_create();
@ -250,6 +247,16 @@ repo_genindex_files(const char *pkgdir)
rmobsoletes_files_cb, ifd); rmobsoletes_files_cb, ifd);
if (rv != 0) if (rv != 0)
goto out; goto out;
for (idx = 0; idx < prop_array_count(ifd->obsoletes); idx++) {
prop_array_get_cstring_nocopy(ifd->obsoletes,
idx, &pkgver);
if (!xbps_remove_pkg_from_array_by_pkgver(
ifd->idxfiles, pkgver)) {
rv = EINVAL;
goto out;
}
printf("Removed obsolete entry for `%s'.\n", pkgver);
}
} }
if (!ifd->flush) if (!ifd->flush)
goto out; goto out;
@ -263,6 +270,8 @@ out:
if (rv == 0) if (rv == 0)
printf("%u packages registered in repository files index.\n", printf("%u packages registered in repository files index.\n",
prop_array_count(ifd->idxfiles)); prop_array_count(ifd->idxfiles));
if (ifd->obsoletes != NULL)
prop_object_release(ifd->obsoletes);
if (ifd->idxfiles != NULL) if (ifd->idxfiles != NULL)
prop_object_release(ifd->idxfiles); prop_object_release(ifd->idxfiles);
if (ifd->idxdict != NULL) if (ifd->idxdict != NULL)