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

xbps-repo: index-clean: simplify code.

Browse Source
This commit is contained in:
Juan RP 2012-07-22 11:45:17 +02:00
parent 8b74616f58
commit 577ae731bb
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/xbps-repo/index.c
View File

@ -46,7 +46,7 @@ repo_index_clean(struct xbps_handle *xhp, const char *repodir)
prop_array_t array; prop_array_t array;
prop_dictionary_t pkgd; prop_dictionary_t pkgd;
const char *filen, *pkgver, *arch; const char *filen, *pkgver, *arch;
char *binpkg, *plist, *plist_lock; char *plist, *plist_lock;
size_t i, idx = 0; size_t i, idx = 0;
int fdlock, rv = 0; int fdlock, rv = 0;
bool flush = false; bool flush = false;
@ -73,6 +73,12 @@ repo_index_clean(struct xbps_handle *xhp, const char *repodir)
return 0; return 0;
} }
} }
if (chdir(repodir) == -1) {
fprintf(stderr, "cannot chdir to %s: %s\n",
repodir, strerror(errno));
rv = errno;
goto out;
}
printf("Cleaning `%s' index, please wait...\n", repodir); printf("Cleaning `%s' index, please wait...\n", repodir);
again: again:
@ -81,22 +87,14 @@ again:
prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(pkgd, "filename", &filen); prop_dictionary_get_cstring_nocopy(pkgd, "filename", &filen);
prop_dictionary_get_cstring_nocopy(pkgd, "architecture", &arch); prop_dictionary_get_cstring_nocopy(pkgd, "architecture", &arch);
binpkg = xbps_xasprintf("%s/%s/%s", repodir, arch, filen); if (access(filen, R_OK) == -1) {
if (binpkg == NULL) {
errno = ENOMEM;
rv = -1;
break;
}
if (access(binpkg, R_OK) == -1) {
printf("index: removed obsolete entry `%s' (%s)\n", printf("index: removed obsolete entry `%s' (%s)\n",
pkgver, arch); pkgver, arch);
prop_array_remove(array, i); prop_array_remove(array, i);
free(binpkg);
flush = true; flush = true;
idx = i; idx = i;
goto again; goto again;
} }
free(binpkg);
} }
if (flush && !prop_array_externalize_to_zfile(array, plist)) { if (flush && !prop_array_externalize_to_zfile(array, plist)) {
rv = errno; rv = errno;