poldek: poldek/install/conflicts.c - bugfix: skip choosing if req ...

[mis]

Author: mis                          Date: Mon Jul  2 20:29:49 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- bugfix: skip choosing if req is satisfied by already being installed set

---- Files affected:
poldek/poldek/install:
   conflicts.c (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: poldek/poldek/install/conflicts.c
diff -u poldek/poldek/install/conflicts.c:1.6 poldek/poldek/install/conflicts.c:1.7
--- poldek/poldek/install/conflicts.c:1.6	Sun Jul  1 23:04:26 2007
+++ poldek/poldek/install/conflicts.c	Mon Jul  2 22:29:44 2007
@@ -99,7 +99,9 @@
     
     if (found) {
         struct pkg *real_tomark = tomark;
-        if (candidates && n_array_size(candidates) > 1) {
+
+        /* tomark == NULL ? req satsfied by already installed set */
+        if (tomark && candidates && n_array_size(candidates) > 1) {
             real_tomark = in_choose_equiv(ictx->ts, req, candidates, tomark);
             n_array_cfree(&candidates);
             if (real_tomark == NULL) { /* user aborts */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/install/conflicts.c?r1=1.6&r2=1.7&f=u