bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Removed needless checking of package infolevel- leave it to the

Browse source 
alpm_pkg_get functions to do this.
This commit is contained in:
Dan McGee 2007-02-14 05:34:21 +00:00
parent f466a8df5a
commit 98db5dcc23
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/libalpm/add.c
View file

@ -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 */ /* we'll need to save some record for backup checks later */
oldpkg = _alpm_pkg_new(local->name, local->version); oldpkg = _alpm_pkg_new(local->name, local->version);
if(oldpkg) { if(oldpkg) {
if(!(local->infolevel & INFRQ_FILES)) { oldpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(local));
_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);
strncpy(oldpkg->name, local->name, PKG_NAME_LEN); strncpy(oldpkg->name, local->name, PKG_NAME_LEN);
strncpy(oldpkg->version, local->version, PKG_VERSION_LEN); strncpy(oldpkg->version, local->version, PKG_VERSION_LEN);
} }
/* copy over the install reason */ /* copy over the install reason */
if(!(local->infolevel & INFRQ_DESC)) { info->reason = alpm_pkg_get_reason(local);
_alpm_db_read(db, INFRQ_DESC, local);
}
info->reason = local->reason;
/* pre_upgrade scriptlet */ /* pre_upgrade scriptlet */
if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {

22
lib/libalpm/alpm.c
View file

@ -476,18 +476,13 @@ int alpm_pkg_checksha1sum(pmpkg_t *pkg)
sha1sum = _alpm_SHAFile(path); sha1sum = _alpm_SHAFile(path);
if(sha1sum == NULL) { 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); pkg->name, pkg->version);
pm_errno = PM_ERR_NOT_A_FILE; pm_errno = PM_ERR_NOT_A_FILE;
retval = -1; retval = -1;
} else { } else {
if(!(pkg->infolevel & INFRQ_DESC)) { if(strcmp(sha1sum, alpm_pkg_get_sha1sum(pkg)) == 0) {
_alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); _alpm_log(PM_LOG_DEBUG, _("sha1sums for package %s-%s match"),
_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"),
pkg->name, pkg->version); pkg->name, pkg->version);
} else { } else {
_alpm_log(PM_LOG_ERROR, _("sha1sums do not match for package %s-%s"), _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); md5sum = _alpm_MDFile(path);
if(md5sum == NULL) { 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); pkg->name, pkg->version);
pm_errno = PM_ERR_NOT_A_FILE; pm_errno = PM_ERR_NOT_A_FILE;
retval = -1; retval = -1;
} else { } else {
if(!(pkg->infolevel & INFRQ_DESC)) { if(strcmp(md5sum, alpm_pkg_get_md5sum(pkg)) == 0) {
_alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); _alpm_log(PM_LOG_DEBUG, _("md5sums for package %s-%s match"),
_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"),
pkg->name, pkg->version); pkg->name, pkg->version);
} else { } else {
_alpm_log(PM_LOG_ERROR, _("md5sums do not match for package %s-%s"), _alpm_log(PM_LOG_ERROR, _("md5sums do not match for package %s-%s"),