[pacman-dev] [PATCH] fix upgrade first prompt for ignored SyncFirst packages

[Richard Pougnet]

Fix bug 26445:

Added a logical AND to line 969 checking to see if
the package marked as SyncFirst is also selected
to be ignored by the user.

        modified:   src/pacman/sync.c

Signed-off-by: Richard Pougnet <richard at pougnet.ca>
---
 src/pacman/sync.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 700bb78..c8902cc 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -966,7 +966,7 @@ int pacman_sync(alpm_list_t *targets)
                if(packages) {
                        /* Do not ask user if all the -S targets are
SyncFirst packages, see FS#15810 */
                        alpm_list_t *tmp = NULL;
-                       if(config->op_s_upgrade || (tmp =
alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) {
+                       if((config->op_s_upgrade || (tmp =
alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) &&
!config->ignorepkg) {
                                alpm_list_free(tmp);
                                printf(_(":: The following packages should
be upgraded first :\n"));
                                list_display("   ", packages);
-- 
1.7.9