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

xbps-remove: misc changes to the clean-cache mode.

Browse Source 
- If orphans mode is not set, exit directly.
- Simplify the clean-cache code to avoid unnecessary allocs in some cases.
This commit is contained in:
Juan RP 2015-01-10 11:13:26 +01:00
parent ee9aa98a64
commit 283fb4bc06
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/xbps-remove/clean-cache.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2014 Juan Romero Pardines. * Copyright (c) 2008-2015 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -47,14 +47,11 @@ cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj,
/* Internalize props.plist dictionary from binary pkg */ /* Internalize props.plist dictionary from binary pkg */
binpkg = xbps_string_cstring_nocopy(obj); binpkg = xbps_string_cstring_nocopy(obj);
pkgver = xbps_binpkg_pkgver(binpkg);
assert(pkgver);
arch = xbps_binpkg_arch(binpkg); arch = xbps_binpkg_arch(binpkg);
assert(arch); assert(arch);
if (!xbps_pkg_arch_match(xhp, arch, NULL)) { if (!xbps_pkg_arch_match(xhp, arch, NULL)) {
xbps_dbg_printf(xhp, "%s: ignoring pkg with unmatched arch (%s)\n", pkgver, arch); xbps_dbg_printf(xhp, "%s: ignoring binpkg with unmatched arch (%s)\n", binpkg, arch);
free(pkgver);
free(arch); free(arch);
return 0; return 0;
} }
@ -63,29 +60,19 @@ cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj,
* Remove binary pkg if it's not registered in any repository * Remove binary pkg if it's not registered in any repository
* or if hash doesn't match. * or if hash doesn't match.
*/ */
binpkgsig = xbps_xasprintf("%s.sig", binpkg); pkgver = xbps_binpkg_pkgver(binpkg);
assert(pkgver);
repo_pkgd = xbps_rpool_get_pkg(xhp, pkgver); repo_pkgd = xbps_rpool_get_pkg(xhp, pkgver);
free(pkgver); free(pkgver);
if (repo_pkgd) { if (repo_pkgd) {
xbps_dictionary_get_cstring_nocopy(repo_pkgd, xbps_dictionary_get_cstring_nocopy(repo_pkgd,
"filename-sha256", &rsha256); "filename-sha256", &rsha256);
if (xbps_file_hash_check(binpkg, rsha256) == ERANGE) { if (xbps_file_hash_check(binpkg, rsha256) == 0) {
if (unlink(binpkg) == -1) { /* hash matched */
fprintf(stderr, "Failed to remove "
"`%s': %s\n", binpkg, strerror(errno));
} else {
printf("Removed %s from cachedir (sha256 mismatch)\n", binpkg);
}
if (unlink(binpkgsig) == -1) {
if (errno != ENOENT) {
fprintf(stderr, "Failed to remove "
"`%s': %s\n", binpkgsig, strerror(errno));
}
}
}
free(binpkgsig);
return 0; return 0;
} }
}
binpkgsig = xbps_xasprintf("%s.sig", binpkg);
if (unlink(binpkg) == -1) { if (unlink(binpkg) == -1) {
fprintf(stderr, "Failed to remove `%s': %s\n", fprintf(stderr, "Failed to remove `%s': %s\n",
binpkg, strerror(errno)); binpkg, strerror(errno));

4
bin/xbps-remove/main.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2014 Juan Romero Pardines. * Copyright (c) 2008-2015 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -269,7 +269,7 @@ main(int argc, char **argv)
if (clean_cache) { if (clean_cache) {
rv = clean_cachedir(&xh); rv = clean_cachedir(&xh);
if (rv != 0) if (!orphans || rv)
exit(rv);; exit(rv);;
} }