poldek: poldek/install3/requirements.c - fixed #117; 'required by installed...

[mis]

Author: mis                          Date: Mon May 12 20:01:38 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- fixed #117; 'required by installed' messages

---- Files affected:
poldek/poldek/install3:
   requirements.c (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: poldek/poldek/install3/requirements.c
diff -u poldek/poldek/install3/requirements.c:1.6 poldek/poldek/install3/requirements.c:1.7
--- poldek/poldek/install3/requirements.c:1.6	Sun Feb 24 23:10:41 2008
+++ poldek/poldek/install3/requirements.c	Mon May 12 22:01:33 2008
@@ -101,7 +101,7 @@
 
     trace(indent, "testing %d package(s)", n_array_size(pkgs));
     if ((best_i = i3_select_best_pkg(indent + 2, ictx, pkg, pkgs)) == -1) {
-       /* can be in multilib mode */
+        /* can be in multilib mode */
         n_array_free(pkgs);
         return NULL;
     }
@@ -311,9 +311,9 @@
     /* unresolved req */
     if (giveup)
         i3_error(ictx, pkg, I3ERR_REQUIREDBY,
-                 _("%s is required by %s, give up"), strreq, pkg_id(pkg));
+                 _("%s is required by installed %s, give up"), strreq, pkg_id(pkg));
     else
-        i3_error(ictx, pkg, I3ERR_REQUIREDBY, _("%s is required by %s"),
+        i3_error(ictx, pkg, I3ERR_REQUIREDBY, _("%s is required by installed %s"),
                  strreq, pkg_id(pkg));
     
  l_end:
@@ -430,7 +430,11 @@
         
         i3pkg->flags &= ~I3PKG_CROSSROAD;
         if (candidates) {
-            n_assert(n_array_size(candidates) > 1);
+            if (n_array_size(candidates) < 2) {
+                logn(LOGWARN, "Assertion failed! Please rerun poldek with env POLDEK_TRACE=1"
+                     " and send log to %s", poldek_BUG_MAILADDR);
+            }
+            
             if (number_of_non_blacks(ictx, candidates) > 1) {
                 /* mark current package as crossroad and propagate mark down */
                 i3pkg->flags |= I3PKG_CROSSROAD; 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/requirements.c?r1=1.6&r2=1.7&f=u