summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-02-06 17:41:36 +0000
committerAaron Griffin <aaron@archlinux.org>2007-02-06 17:41:36 +0000
commit7d63ecfac6ed7154049df92358f5514982535431 (patch)
tree0db5444906968bb0adff1f4dc19b2a0836999a01 /lib
parent67ea493ec24caa7279b35a28d96e5d6f2c271f59 (diff)
downloadpacman-7d63ecfac6ed7154049df92358f5514982535431.tar.xz
Copy-pasta errors. 8)
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/package.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 66fa14bb..9bc34016 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -125,7 +125,7 @@ void _alpm_pkg_free(void *data)
/* Is pkgB an upgrade for pkgA ? */
int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB)
{
- if(spkg->force) {
+ if(pkgB->force) {
/* skip the version compare call if this is a 'force' package */
return(1);
}
@@ -133,21 +133,21 @@ int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB)
/* compare versions and see if we need to upgrade */
int cmp = alpm_versioncmp(pkgA->version, pkgB->version);
- if(cmp > 0 && !spkg->force) {
+ if(cmp > 0) {
/* local version is newer */
- pmdb_t *db = spkg->data;
+ pmdb_t *db = pkgB->data;
_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"),
- local->name, local->version, db->treename, spkg->version);
+ pkgA->name, pkgA->version, db->treename, pkgB->version);
cmp = 0;
- } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) {
+ } else if(alpm_list_find_str(handle->ignorepkg, pkgB->name)) {
/* package should be ignored (IgnorePkg) */
_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
- local->name, local->version, spkg->version);
+ pkgA->name, pkgA->version, pkgB->version);
cmp = 0;
- } else if(_alpm_pkg_istoonew(spkg)) {
+ } else if(_alpm_pkg_istoonew(pkgB)) {
/* package too new (UpgradeDelay) */
_alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"),
- local->name, local->version, spkg->version);
+ pkgA->name, pkgA->version, pkgB->version);
cmp = 0;
}