diff options
| author | Allan McRae <allan@archlinux.org> | 2012-02-18 07:31:37 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-09 00:58:04 +0100 |
| commit | 5c404268d965d9ca012e4819ac0c2f289a4c768c (patch) | |
| tree | ec83d7e1d7c88886fc4cf8438ba42ccb9627c8e2 /lib/libalpm/sync.c | |
| parent | bc311a24ce536fbf30cc2356a62b08a6c0938ea9 (diff) | |
| download | pacman-5c404268d965d9ca012e4819ac0c2f289a4c768c.tar.gz pacman-5c404268d965d9ca012e4819ac0c2f289a4c768c.tar.xz | |
Add information on how an installed package was validated
When installing a package, store information on which validation
method was used and output this on "pacman -Qi" operations.
e.g.
Validated By : SHA256 Sum
Possible values are Unknown, None, MD5 Sum, SHA256 Sum, Signature.
Dan: just a few very minor tweaks.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7f4ef055..5f698008 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -972,6 +972,7 @@ static int check_validity(alpm_handle_t *handle, char *path; alpm_siglist_t *siglist; alpm_siglevel_t level; + alpm_pkgvalidation_t validation; alpm_errno_t error; }; size_t current = 0, current_bytes = 0; @@ -981,7 +982,7 @@ static int check_validity(alpm_handle_t *handle, EVENT(handle, ALPM_EVENT_INTEGRITY_START, NULL, NULL); for(i = handle->trans->add; i; i = i->next, current++) { - struct validity v = { i->data, NULL, NULL, 0, 0 }; + struct validity v = { i->data, NULL, NULL, 0, 0, 0 }; int percent = (int)(((double)current_bytes / total_bytes) * 100); PROGRESS(handle, ALPM_PROGRESS_INTEGRITY_START, "", percent, @@ -995,7 +996,7 @@ static int check_validity(alpm_handle_t *handle, v.level = alpm_db_get_siglevel(alpm_pkg_get_db(v.pkg)); if(_alpm_pkg_validate_internal(handle, v.path, v.pkg, - v.level, &v.siglist) == -1) { + v.level, &v.siglist, &v.validation) == -1) { v.error = handle->pm_errno; struct validity *invalid = malloc(sizeof(struct validity)); memcpy(invalid, &v, sizeof(struct validity)); @@ -1004,6 +1005,7 @@ static int check_validity(alpm_handle_t *handle, alpm_siglist_cleanup(v.siglist); free(v.siglist); free(v.path); + v.pkg->validation = v.validation; } } @@ -1083,6 +1085,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, free(filepath); /* copy over the install reason */ pkgfile->reason = spkg->reason; + /* copy over validation method */ + pkgfile->validation = spkg->validation; i->data = pkgfile; /* spkg has been removed from the target list, so we can free the * sync-specific fields */ |