poldek: poldek/install3/obsoletes.c - capreq_stra()

mis mis at pld-linux.org
Sat Feb 2 22:30:21 CET 2008


Author: mis                          Date: Sat Feb  2 21:30:21 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- capreq_stra()

---- Files affected:
poldek/poldek/install3:
   obsoletes.c (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: poldek/poldek/install3/obsoletes.c
diff -u poldek/poldek/install3/obsoletes.c:1.3 poldek/poldek/install3/obsoletes.c:1.4
--- poldek/poldek/install3/obsoletes.c:1.3	Wed Jan 30 22:29:35 2008
+++ poldek/poldek/install3/obsoletes.c	Sat Feb  2 22:30:16 2008
@@ -30,7 +30,7 @@
         const struct capreq *req;
         struct capreq *cap = n_array_nth(caps, i);
 
-        //tracef(0, "%s requires %s?", pkg_id(pkg), capreq_snprintf_s(cap));
+        //tracef(0, "%s requires %s?", pkg_id(pkg), capreq_stra(cap));
         if ((req = pkg_requires_cap(pkg, cap)))
             n_array_push(o->reqs, (struct capreq *)req);
     }
@@ -90,7 +90,7 @@
                                   iset_packages_by_recno(ictx->unset),
                                   ldflags, ma_flags);
         norphaned += n;
-        trace(indent + 1, "%s: %d package(s) orphaned", capreq_snprintf_s(cap), n);
+        trace(indent + 1, "%s: %d package(s) orphaned", capreq_stra(cap), n);
     }
     return norphaned;
 }
@@ -243,7 +243,7 @@
             int is_satisfied = 0;
 
             if (capreq_is_file(cap) && !is_requireable_path(capreq_name(cap))) {
-                trace(indent + 2, "- %s (skipped)", capreq_snprintf_s(cap));
+                trace(indent + 2, "- %s (skipped)", capreq_stra(cap));
                 continue;
             }
             
@@ -254,14 +254,14 @@
                 is_satisfied = 2;
             
             if (is_satisfied) {
-                trace(indent + 2, "- %s (satisfied %s)", capreq_snprintf_s(cap),
+                trace(indent + 2, "- %s (satisfied %s)", capreq_stra(cap),
                       is_satisfied == 1 ? "by successor" : "by inset");
                 
             } else {
                 if (unsatisfied_caps == NULL)
                     unsatisfied_caps = capreq_arr_new(24);
                 
-                trace(indent + 2, "- %s (to verify)", capreq_snprintf_s(cap));
+                trace(indent + 2, "- %s (to verify)", capreq_stra(cap));
                 n_array_push(unsatisfied_caps, capreq_clone(NULL, cap));
             }
         }
================================================================

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



More information about the pld-cvs-commit mailing list