diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2008-11-09 17:34:49 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-04-11 20:54:25 +0200 |
| commit | 77efd512165ca2066dc6547bda52082f8bd11db2 (patch) | |
| tree | 328c1cbd81550ff8949751ed677200dda29ececa /src | |
| parent | 93ca155b48a29685914ffa10b11be42ef5d4734a (diff) | |
| download | pacman-77efd512165ca2066dc6547bda52082f8bd11db2.tar.gz pacman-77efd512165ca2066dc6547bda52082f8bd11db2.tar.xz | |
New error type: PM_ERR_PKG_IGNORED
This patch fixes FS#12059.
Now sync_addtarget can return with PM_ERR_PKG_IGNORED, which indicates that
although the requested package was found it is in ignorepkg, so alpm could
not add it to the transaction. So the front-end can decide what to do.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index d8a63481..0e193551 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -574,11 +574,12 @@ static int sync_trans(alpm_list_t *targets) char *targ = alpm_list_getdata(i); if(alpm_trans_addtarget(targ) == -1) { pmgrp_t *grp = NULL; - int found=0; + int found = 0; alpm_list_t *j; - if(pm_errno == PM_ERR_TRANS_DUP_TARGET) { - /* just ignore duplicate targets */ + if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) { + /* just skip duplicate or ignored targets */ + pm_printf(PM_LOG_WARNING, _("skipping target: %s\n"), targ); continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { |