poldek: poldek/pkgset.c, poldek/pkgset-req.c - renamed pkgset_sear...

[mis]

Author: mis                          Date: Tue Jan 22 12:36:44 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- renamed pkgset_search_reqdir()

---- Files affected:
poldek/poldek:
   pkgset.c (1.101 -> 1.102) , pkgset-req.c (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgset.c
diff -u poldek/poldek/pkgset.c:1.101 poldek/poldek/pkgset.c:1.102
--- poldek/poldek/pkgset.c:1.101	Sat Jul 14 00:36:13 2007
+++ poldek/poldek/pkgset.c	Tue Jan 22 13:36:39 2008
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000 - 2007 Pawel A. Gajda <mis at pld-linux.org>
+  Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2 as
@@ -468,7 +468,7 @@
 }
 
 static
-tn_array *do_search_reqdir(struct pkgset *ps, tn_array *pkgs, const char *dir)
+tn_array *do_search_provdir(struct pkgset *ps, tn_array *pkgs, const char *dir)
 {
     tn_array *tmp = pkgs_array_new(32);
     int i, pkgs_passsed = 1;
@@ -511,9 +511,9 @@
     return pkgs;
 }
 
-tn_array *pkgset_search_reqdir(struct pkgset *ps, const char *dir)
+tn_array *pkgset_search_provdir(struct pkgset *ps, const char *dir)
 {
-    return do_search_reqdir(ps, NULL, dir);
+    return do_search_provdir(ps, NULL, dir);
 }
 
 tn_array *pkgset_search(struct pkgset *ps, enum pkgset_search_tag tag,
@@ -568,7 +568,8 @@
                         n_array_push(pkgs, pkg_link(buf[i]));
 
                 } else {
-                    do_search_reqdir(ps, pkgs, value);
+                    DBGF("s %s\n", value);
+                    do_search_provdir(ps, pkgs, value);
                 }
             }
             break;

================================================================
Index: poldek/poldek/pkgset-req.c
diff -u poldek/poldek/pkgset-req.c:1.53 poldek/poldek/pkgset-req.c:1.54
--- poldek/poldek/pkgset-req.c:1.53	Thu Jul 12 23:29:26 2007
+++ poldek/poldek/pkgset-req.c	Tue Jan 22 13:36:39 2008
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000 - 2007 Pawel A. Gajda <mis at pld.org.pl>
+  Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2 as
@@ -32,7 +32,7 @@
 #include "fileindex.h"
 
 extern int poldek_conf_MULTILIB;
-extern tn_array *pkgset_search_reqdir(struct pkgset *ps, const char *dir);
+extern tn_array *pkgset_search_provdir(struct pkgset *ps, const char *dir);
 
 void *pkg_na_malloc(struct pkg *pkg, size_t size);
 
@@ -324,7 +324,7 @@
             
         } else {                /* n is 0 */
             tn_array *pkgs;
-            if ((pkgs = pkgset_search_reqdir(ps, reqname))) {
+            if ((pkgs = pkgset_search_provdir(ps, reqname))) {
                 int i;
                 n = 0;
 
@@ -375,7 +375,6 @@
 
     if (!matched && pkgset_pm_satisfies(ps, req)) {
         matched = 1;
-        capreq_set_satisfied((struct capreq*)req); /* XXX */
         msgn(4, " req %-35s --> PM_CAP", capreq_snprintf_s(req));
         
         *suspkgs = NULL;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/pkgset.c?r1=1.101&r2=1.102&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/pkgset-req.c?r1=1.53&r2=1.54&f=u