diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2007-11-16 15:34:04 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-18 19:37:16 +0100 |
| commit | 8f824e70bbaf9cb2b72103fe378d93e3ded8cdee (patch) | |
| tree | dde228d521118ae8470d609c3ae10eef0f688b7a /lib/libalpm/package.c | |
| parent | e174865bdc154248b8b8fcf03eaa19da78e0f67b (diff) | |
| download | pacman-8f824e70bbaf9cb2b72103fe378d93e3ded8cdee.tar.gz pacman-8f824e70bbaf9cb2b72103fe378d93e3ded8cdee.tar.xz | |
Remove the IgnorePkg handling from alpm_pkg_compare_version.
And check the IgnorePkg handling is done correctly in the other places.
For example, -Qu and -Su will automatically skip the ignored packages (-Su will print a warning),
but -S will install ignored packages anyway, because it was asked explicitly.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Diffstat (limited to 'lib/libalpm/package.c')
| -rw-r--r-- | lib/libalpm/package.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 18d04e00..24304e14 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -731,16 +731,6 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) /* compare versions and see if we need to upgrade */ cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg)); - if(_alpm_pkg_should_ignore(pkg)) { - /* package should be ignored (IgnorePkg) */ - if(cmp > 0) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)\n"), - alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), - alpm_pkg_get_version(pkg)); - } - return(0); - } - if(cmp != 0 && pkg->force) { cmp = 1; _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"), |