summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-20 21:55:53 +0100
committerAurelien Foret <aurelien@archlinux.org>2006-02-20 21:55:53 +0100
commit9d4713e2a3b85f3d9d50d543928847f69c395dc7 (patch)
tree8660277bccc0fe675ef1fe7ae0cb5cc539ae5eb8 /lib
parent590f610d6b79d4bec993e03bebf7d0850b470f6d (diff)
downloadpacman-9d4713e2a3b85f3d9d50d543928847f69c395dc7.tar.gz
pacman-9d4713e2a3b85f3d9d50d543928847f69c395dc7.tar.xz
checkmd5sums enhancements
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/alpm.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 41cd49f1..8dacc61e 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -421,7 +421,7 @@ void *alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
if(!(pkg->infolevel & INFRQ_DESC)) {
char target[PKG_FULLNAME_LEN];
snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
- db_read(pkg->data, target, INFRQ_DESC, pkg);
+ _alpm_db_read(pkg->data, target, INFRQ_DESC, pkg);
}
break;*/
/* Depends entry */
@@ -535,7 +535,8 @@ int alpm_pkg_checkmd5sum(pmpkg_t *pkg)
int retval = 0;
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
- ASSERT(pkg->md5sum[0] != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+ ASSERT(pkg->origin == PKG_FROM_CACHE, RET_ERR(PM_ERR_PKG_INVALID, -1));
+ ASSERT(pkg->data != handle->db_local, RET_ERR(PM_ERR_PKG_INVALID, -1));
asprintf(&path, "%s%s/%s-%s" PM_EXT_PKG,
handle->root, handle->cachedir,
@@ -548,7 +549,16 @@ int alpm_pkg_checkmd5sum(pmpkg_t *pkg)
pm_errno = PM_ERR_NOT_A_FILE;
retval = -1;
} else {
- if(strcmp(md5sum, pkg->md5sum) != 0) {
+ if(!(pkg->infolevel & INFRQ_DESC)) {
+ char target[PKG_FULLNAME_LEN];
+ snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
+ _alpm_db_read(pkg->data, target, INFRQ_DESC, pkg);
+ }
+
+ if(strcmp(md5sum, pkg->md5sum) == 0) {
+ _alpm_log(PM_LOG_FLOW1, "checksums for package %s-%s are matching",
+ pkg->name, pkg->version);
+ } else {
_alpm_log(PM_LOG_ERROR, "md5sums do not match for package %s-%s\n",
pkg->name, pkg->version);
pm_errno = PM_ERR_PKG_INVALID;