mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Simplify package validation info output for sync packages
Unify the output for local and sync packages by only printing a list of possible validation types for sync packages. This also has the advantage of not printing the very long sha256 checksum which line wrapped on a standard width terminal. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
4773c6b66e
commit
f34864cc9e
@ -296,6 +296,29 @@ cleanup:
|
|||||||
static int sync_db_read(alpm_db_t *db, struct archive *archive,
|
static int sync_db_read(alpm_db_t *db, struct archive *archive,
|
||||||
struct archive_entry *entry, alpm_pkg_t **likely_pkg);
|
struct archive_entry *entry, alpm_pkg_t **likely_pkg);
|
||||||
|
|
||||||
|
static alpm_pkgvalidation_t _sync_get_validation(alpm_pkg_t *pkg)
|
||||||
|
{
|
||||||
|
if(pkg->validation) {
|
||||||
|
return pkg->validation;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(pkg->md5sum) {
|
||||||
|
pkg->validation |= ALPM_PKG_VALIDATION_MD5SUM;
|
||||||
|
}
|
||||||
|
if(pkg->sha256sum) {
|
||||||
|
pkg->validation |= ALPM_PKG_VALIDATION_SHA256SUM;
|
||||||
|
}
|
||||||
|
if(pkg->base64_sig) {
|
||||||
|
pkg->validation |= ALPM_PKG_VALIDATION_SIGNATURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!pkg->validation) {
|
||||||
|
pkg->validation |= ALPM_PKG_VALIDATION_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return pkg->validation;
|
||||||
|
}
|
||||||
|
|
||||||
static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
|
static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
|
||||||
const char **entry_filename, alpm_pkg_t *likely_pkg)
|
const char **entry_filename, alpm_pkg_t *likely_pkg)
|
||||||
{
|
{
|
||||||
@ -337,6 +360,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname,
|
|||||||
pkg->origin = PKG_FROM_SYNCDB;
|
pkg->origin = PKG_FROM_SYNCDB;
|
||||||
pkg->origin_data.db = db;
|
pkg->origin_data.db = db;
|
||||||
pkg->ops = &default_pkg_ops;
|
pkg->ops = &default_pkg_ops;
|
||||||
|
pkg->ops->get_validation = _sync_get_validation;
|
||||||
pkg->handle = db->handle;
|
pkg->handle = db->handle;
|
||||||
|
|
||||||
/* add to the collection */
|
/* add to the collection */
|
||||||
|
@ -109,25 +109,23 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(from == PKG_FROM_LOCALDB) {
|
alpm_pkgvalidation_t v = alpm_pkg_get_validation(pkg);
|
||||||
alpm_pkgvalidation_t v = alpm_pkg_get_validation(pkg);
|
if(v) {
|
||||||
if(v) {
|
if(v & ALPM_PKG_VALIDATION_NONE) {
|
||||||
if(v & ALPM_PKG_VALIDATION_NONE) {
|
validation = alpm_list_add(validation, _("None"));
|
||||||
validation = alpm_list_add(validation, _("None"));
|
|
||||||
} else {
|
|
||||||
if(v & ALPM_PKG_VALIDATION_MD5SUM) {
|
|
||||||
validation = alpm_list_add(validation, _("MD5 Sum"));
|
|
||||||
}
|
|
||||||
if(v & ALPM_PKG_VALIDATION_SHA256SUM) {
|
|
||||||
validation = alpm_list_add(validation, _("SHA256 Sum"));
|
|
||||||
}
|
|
||||||
if(v & ALPM_PKG_VALIDATION_SIGNATURE) {
|
|
||||||
validation = alpm_list_add(validation, _("Signature"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
validation = alpm_list_add(validation, _("Unknown"));
|
if(v & ALPM_PKG_VALIDATION_MD5SUM) {
|
||||||
|
validation = alpm_list_add(validation, _("MD5 Sum"));
|
||||||
|
}
|
||||||
|
if(v & ALPM_PKG_VALIDATION_SHA256SUM) {
|
||||||
|
validation = alpm_list_add(validation, _("SHA256 Sum"));
|
||||||
|
}
|
||||||
|
if(v & ALPM_PKG_VALIDATION_SIGNATURE) {
|
||||||
|
validation = alpm_list_add(validation, _("Signature"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
validation = alpm_list_add(validation, _("Unknown"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(extra || from == PKG_FROM_LOCALDB) {
|
if(extra || from == PKG_FROM_LOCALDB) {
|
||||||
@ -176,12 +174,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
|
|||||||
alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"));
|
alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(from == PKG_FROM_SYNCDB) {
|
list_display(_("Validated By :"), validation);
|
||||||
string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg));
|
|
||||||
string_display(_("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg));
|
|
||||||
string_display(_("Signatures :"),
|
|
||||||
alpm_pkg_get_base64_sig(pkg) ? _("Yes") : _("None"));
|
|
||||||
}
|
|
||||||
if(from == PKG_FROM_FILE) {
|
if(from == PKG_FROM_FILE) {
|
||||||
alpm_siglist_t siglist;
|
alpm_siglist_t siglist;
|
||||||
int err = alpm_pkg_check_pgp_signature(pkg, &siglist);
|
int err = alpm_pkg_check_pgp_signature(pkg, &siglist);
|
||||||
@ -195,9 +189,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
|
|||||||
}
|
}
|
||||||
alpm_siglist_cleanup(&siglist);
|
alpm_siglist_cleanup(&siglist);
|
||||||
}
|
}
|
||||||
if(from == PKG_FROM_LOCALDB) {
|
|
||||||
list_display(_("Validated By :"), validation);
|
|
||||||
}
|
|
||||||
string_display(_("Description :"), alpm_pkg_get_desc(pkg));
|
string_display(_("Description :"), alpm_pkg_get_desc(pkg));
|
||||||
|
|
||||||
/* Print additional package info if info flag passed more than once */
|
/* Print additional package info if info flag passed more than once */
|
||||||
|
Loading…
Reference in New Issue
Block a user