diff options
| author | Dan McGee <dan@archlinux.org> | 2007-02-14 06:34:21 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-02-14 06:34:21 +0100 |
| commit | 98db5dcc23d6f61c346053c35424fcdeca2d4f92 (patch) | |
| tree | 27a20db27ca3feb22a2f23e1b96ec8a2eccda68f | |
| parent | f466a8df5a3a531cab4b78e5d061f2377b4faf83 (diff) | |
| download | pacman-98db5dcc23d6f61c346053c35424fcdeca2d4f92.tar.gz pacman-98db5dcc23d6f61c346053c35424fcdeca2d4f92.tar.xz | |
* Removed needless checking of package infolevel- leave it to the
alpm_pkg_get functions to do this.
| -rw-r--r-- | lib/libalpm/add.c | 11 | ||||
| -rw-r--r-- | lib/libalpm/alpm.c | 22 |
2 files changed, 8 insertions, 25 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index d7a4a5ca..9a683b39 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -400,20 +400,13 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_new(local->name, local->version); if(oldpkg) { - if(!(local->infolevel & INFRQ_FILES)) { - _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), local->name); - _alpm_db_read(db, INFRQ_FILES, local); - } - oldpkg->backup = alpm_list_strdup(local->backup); + oldpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(local)); strncpy(oldpkg->name, local->name, PKG_NAME_LEN); strncpy(oldpkg->version, local->version, PKG_VERSION_LEN); } /* copy over the install reason */ - if(!(local->infolevel & INFRQ_DESC)) { - _alpm_db_read(db, INFRQ_DESC, local); - } - info->reason = local->reason; + info->reason = alpm_pkg_get_reason(local); /* pre_upgrade scriptlet */ if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index b55d4d27..ba96606f 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -476,18 +476,13 @@ int alpm_pkg_checksha1sum(pmpkg_t *pkg) sha1sum = _alpm_SHAFile(path); if(sha1sum == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not get sha1 checksum for package %s-%s"), + _alpm_log(PM_LOG_ERROR, _("could not get sha1sum for package %s-%s"), pkg->name, pkg->version); pm_errno = PM_ERR_NOT_A_FILE; retval = -1; } else { - if(!(pkg->infolevel & INFRQ_DESC)) { - _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); - } - - if(strcmp(sha1sum, pkg->sha1sum) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checksums for package %s-%s are matching"), + if(strcmp(sha1sum, alpm_pkg_get_sha1sum(pkg)) == 0) { + _alpm_log(PM_LOG_DEBUG, _("sha1sums for package %s-%s match"), pkg->name, pkg->version); } else { _alpm_log(PM_LOG_ERROR, _("sha1sums do not match for package %s-%s"), @@ -525,18 +520,13 @@ int alpm_pkg_checkmd5sum(pmpkg_t *pkg) md5sum = _alpm_MDFile(path); if(md5sum == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not get md5 checksum for package %s-%s"), + _alpm_log(PM_LOG_ERROR, _("could not get md5sum for package %s-%s"), pkg->name, pkg->version); pm_errno = PM_ERR_NOT_A_FILE; retval = -1; } else { - if(!(pkg->infolevel & INFRQ_DESC)) { - _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); - } - - if(strcmp(md5sum, pkg->md5sum) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checksums for package %s-%s are matching"), + if(strcmp(md5sum, alpm_pkg_get_md5sum(pkg)) == 0) { + _alpm_log(PM_LOG_DEBUG, _("md5sums for package %s-%s match"), pkg->name, pkg->version); } else { _alpm_log(PM_LOG_ERROR, _("md5sums do not match for package %s-%s"), |