Date: Sunday, April 22, 2007 @ 23:46:54
Author: aaron
Path: /home/cvs-pacman/pacman-lib/lib/libalpm
Modified: package.c (1.86 -> 1.87)
* Chantry Xavier
Let IgnorePkg take precedence over the FORCE package flag
-----------+
package.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Index: pacman-lib/lib/libalpm/package.c
diff -u pacman-lib/lib/libalpm/package.c:1.86 pacman-lib/lib/libalpm/package.c:1.87
--- pacman-lib/lib/libalpm/package.c:1.86 Mon Mar 12 00:47:58 2007
+++ pacman-lib/lib/libalpm/package.c Sun Apr 22 23:46:54 2007
@@ -142,6 +142,14 @@
_alpm_db_read(pkg->data, pkg, INFRQ_DESC);
}
+ if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
+ /* package should be ignored (IgnorePkg) */
+ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
+ alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
+ alpm_pkg_get_version(pkg));
+ return(0);
+ }
+
/* compare versions and see if we need to upgrade */
cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg));
@@ -158,13 +166,7 @@
cmp = 0;
} else if(cmp > 0) {
/* we have an upgrade, make sure we should actually do it */
- if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
- /* package should be ignored (IgnorePkg) */
- _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
- alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
- alpm_pkg_get_version(pkg));
- cmp = 0;
- } else if(_alpm_pkg_istoonew(pkg)) {
+ if(_alpm_pkg_istoonew(pkg)) {
/* package too new (UpgradeDelay) */
_alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"),
alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),