diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-12-01 09:32:29 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-12-01 09:32:29 +0000 |
| commit | 08dca1593f82dfa4b5f1199b5b1f4d7099719be9 (patch) | |
| tree | b1b383f93524ebfcb5bfcc98924668f29dc88ba3 /lib/libalpm/sync.c | |
| parent | 6c68723905ba1d8cee83e4af88b0ac8ee9a408aa (diff) | |
| download | pacman-08dca1593f82dfa4b5f1199b5b1f4d7099719be9.tar.xz | |
* Cosmetic changes and typo fixes
* IgnorePkg and --ignore work again
* Partial changes to support removal of conflicts for -U and -A (INCOMPLETE)
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 470216cb..a2645a38 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -220,7 +220,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync local->name, local->version, db->treename, spkg->version); } else if(cmp == 0) { /* versions are identical */ - } else if(_alpm_list_is_strin(i->data, handle->ignorepkg)) { + } else if(_alpm_list_is_strin(spkg->name, handle->ignorepkg)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local->name, local->version, spkg->version); @@ -367,10 +367,11 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, /* Helper functions for _alpm_list_remove */ +/* removed - use pkg_cmp all of the time static int ptr_cmp(const void *s1, const void *s2) { return(strcmp(((pmsyncpkg_t *)s1)->pkg->name, ((pmsyncpkg_t *)s2)->pkg->name)); -} +}*/ static int pkg_cmp(const void *p1, const void *p2) { @@ -562,7 +563,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, p pmsyncpkg_t *rsync = find_pkginsync(rmpkg, trans->packages); void *vpkg; _alpm_log(PM_LOG_FLOW2, _("removing '%s' from target list"), rmpkg); - trans->packages = _alpm_list_remove(trans->packages, rsync, ptr_cmp, &vpkg); + trans->packages = _alpm_list_remove(trans->packages, rsync, pkg_cmp, &vpkg); FREESYNC(vpkg); continue; } @@ -599,7 +600,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, p /* remove it from the target list */ void *vpkg; _alpm_log(PM_LOG_FLOW2, _("removing '%s' from target list"), miss->depend.name); - trans->packages = _alpm_list_remove(trans->packages, rsync, ptr_cmp, &vpkg); + trans->packages = _alpm_list_remove(trans->packages, rsync, pkg_cmp, &vpkg); FREESYNC(vpkg); } } else { |