[pacman-dev] IgnorePkg handling

[Xavier]

On Thu, Nov 15, 2007 at 04:41:59PM -0600, Dan McGee wrote:
> On Nov 15, 2007 4:27 PM, Xavier <shiningxc at gmail.com> wrote:
> > I just found another thing I overlooked in a patch I submitted a while ago :
> > "Let IgnorePkg superceed the FORCE package flag" , commit 5de03497c3f.
> >
> > I didn't see a change Dan made one month before :
> > "* --ignore was being ignored (haha) on sysupgrade when a package was listed
> > as being a force upgrade. This adds a prompt to the user in this case
> > asking what to do." , commit 4a0aac3862 .
> >
> > So the change I made in alpm_pkg_compare_versions made this fix from Dan in
> > _alpm_sync_sysupgrade obsolete. This code can't be run anymore.
> > So I don't know, maybe this commit could be reverted now?
> 
> Something like this?
> 
>  lib/libalpm/sync.c |    9 ---------
>  1 files changed, 0 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
> index e5748e6..16ea5c2 100644
> --- a/lib/libalpm/sync.c
> +++ b/lib/libalpm/sync.c
> @@ -213,15 +213,6 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans,
> pmdb_t *db_local, alpm_list_t *dbs_s
> 
>  alpm_pkg_get_name(local), alpm_pkg_get_version(local),
> 
>  alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
>                                 if(!_alpm_sync_find(trans->packages,
> alpm_pkg_get_name(spkg))) {
> -                                       /* If package is in the
> ignorepkg list, ask before we add it to
> -                                        * the transaction */
> -                                       if(_alpm_pkg_should_ignore(local)) {
> -                                               int resp = 0;
> -                                               QUESTION(trans,
> PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp);
> -                                               if(!resp) {
> -                                                       continue;
> -                                               }
> -                                       }
>                                         pmpkg_t *tmp = _alpm_pkg_dup(local);
>                                         if(tmp == NULL) {
>                                                 goto error;
> 

Yes, that looks fine.
I should probably check the other places where should_ignore is used though.