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

* Fixed _alpm_pkg_compare_versions so that it does not output warnings if versions match. (reported by Travis Willard)

Browse source
This commit is contained in:
Aaron Griffin 2007-02-14 16:15:09 +00:00
parent cd34ced4ad
commit 3a2d87d61d
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/libalpm/package.c
View file

@ -150,17 +150,20 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"),
local_pkg->name, local_pkg->version, db->treename, pkg->version); local_pkg->name, local_pkg->version, db->treename, pkg->version);
cmp = 0; cmp = 0;
} else if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { } else if(cmp < 0) {
/* we have an upgrade, make sure we should actually do it */
if(alpm_list_find_str(handle->ignorepkg, pkg->name)) {
/* package should be ignored (IgnorePkg) */ /* package should be ignored (IgnorePkg) */
_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
local_pkg->name, local_pkg->version, pkg->version); local_pkg->name, local_pkg->version, pkg->version);
cmp = 0; cmp = 0;
} else if(_alpm_pkg_istoonew(pkg)) { } else if(_alpm_pkg_istoonew(pkg)) {
/* package too new (UpgradeDelay) */ /* package too new (UpgradeDelay) */
_alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), _alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"),
local_pkg->name, local_pkg->version, pkg->version); local_pkg->name, local_pkg->version, pkg->version);
cmp = 0; cmp = 0;
} }
}
_alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"), _alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"),
local_pkg->name, local_pkg->version, pkg->version, cmp); local_pkg->name, local_pkg->version, pkg->version, cmp);