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

xbps-pkgdb: update for pkgdb-0.38.

Browse Source
This commit is contained in:
Juan RP 2014-09-11 08:00:37 +02:00
parent fcce0a36aa
commit bd2bb98fa7
2 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bin/xbps-pkgdb/check.c
View File

@ -72,7 +72,7 @@ check_pkg_integrity(struct xbps_handle *xhp,
xbps_dictionary_t pkgd, xbps_dictionary_t pkgd,
const char *pkgname) const char *pkgname)
{ {
xbps_dictionary_t opkgd, filesd; xbps_dictionary_t opkgd, filesd = NULL;
const char *sha256; const char *sha256;
char *buf; char *buf;
int rv = 0; int rv = 0;
@ -89,29 +89,18 @@ check_pkg_integrity(struct xbps_handle *xhp,
} }
} }
/* /*
* Check for pkg files metadata file. * Check pkg files metadata signature.
*/ */
buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname); if (xbps_dictionary_get_cstring_nocopy(opkgd, "metafile-sha256", &sha256)) {
filesd = xbps_dictionary_internalize_from_file(buf);
free(buf);
if (filesd == NULL) {
xbps_error_printf("%s: unexistent files metafile!\n", pkgname);
return EINVAL;
} else if (xbps_dictionary_count(filesd) == 0) {
xbps_error_printf("%s: incomplete metadata file.\n", pkgname);
xbps_object_release(filesd);
return 1;
}
/*
* Check pkg metadata signature.
*/
xbps_dictionary_get_cstring_nocopy(opkgd, "metafile-sha256", &sha256);
if (sha256 != NULL) {
buf = xbps_xasprintf("%s/.%s-files.plist", buf = xbps_xasprintf("%s/.%s-files.plist",
xhp->metadir, pkgname); xhp->metadir, pkgname);
rv = xbps_file_hash_check(buf, sha256); rv = xbps_file_hash_check(buf, sha256);
free(buf); free(buf);
if (rv == ERANGE) { if (rv == ENOENT) {
xbps_dictionary_remove(opkgd, "metafile-sha256");
fprintf(stderr, "%s: unexistent metafile, "
"updating pkgdb.\n", pkgname);
} else if (rv == ERANGE) {
xbps_object_release(filesd); xbps_object_release(filesd);
fprintf(stderr, "%s: metadata file has been " fprintf(stderr, "%s: metadata file has been "
"modified!\n", pkgname); "modified!\n", pkgname);
@ -119,14 +108,16 @@ check_pkg_integrity(struct xbps_handle *xhp,
} }
} }
#define RUN_PKG_CHECK(x, name, arg) \ #define RUN_PKG_CHECK(x, name, arg) \
do { \ do { \
rv = check_pkg_##name(x, pkgname, arg); \ if (arg != NULL) { \
if (rv == -1) { \ rv = check_pkg_##name(x, pkgname, arg); \
xbps_error_printf("%s: the %s test " \ if (rv == -1) { \
"returned error!\n", pkgname, #name); \ xbps_error_printf("%s: the %s test " \
return rv; \ "returned error!\n", pkgname, #name); \
} \ return rv; \
} \
} \
} while (0) } while (0)
/* Execute pkg checks */ /* Execute pkg checks */
@ -135,7 +126,8 @@ do { \
RUN_PKG_CHECK(xhp, rundeps, opkgd); RUN_PKG_CHECK(xhp, rundeps, opkgd);
RUN_PKG_CHECK(xhp, unneeded, opkgd); RUN_PKG_CHECK(xhp, unneeded, opkgd);
xbps_object_release(filesd); if (filesd)
xbps_object_release(filesd);
#undef RUN_PKG_CHECK #undef RUN_PKG_CHECK

14
bin/xbps-pkgdb/check_pkg_unneeded.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2013 Juan Romero Pardines. * Copyright (c) 2014 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,10 @@ check_pkg_unneeded(struct xbps_handle *xhp _unused, const char *pkgname _unused,
{ {
xbps_dictionary_t pkgd = arg; xbps_dictionary_t pkgd = arg;
if (xbps_dictionary_get(pkgd, "remove-and-update")) xbps_dictionary_remove(pkgd, "download");
xbps_dictionary_remove(pkgd, "remove-and-update"); xbps_dictionary_remove(pkgd, "remove-and-update");
xbps_dictionary_remove(pkgd, "transaction");
if (xbps_dictionary_get(pkgd, "transaction")) xbps_dictionary_remove(pkgd, "skip-obsoletes");
xbps_dictionary_remove(pkgd, "transaction");
if (xbps_dictionary_get(pkgd, "skip-obsoletes"))
xbps_dictionary_remove(pkgd, "skip-obsoletes");
return 0; return 0;
} }