poldek: poldek/pm/pkgdb.c, poldek/uninstall.c - fixed #5743 bug (h...

[mis]

Author: mis                          Date: Sat Mar 18 15:18:09 2006 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- fixed #5743 bug (http://bugs.pld-linux.org/?id=5743)

---- Files affected:
poldek/poldek/pm:
   pkgdb.c (1.21 -> 1.22) 
poldek/poldek:
   uninstall.c (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: poldek/poldek/pm/pkgdb.c
diff -u poldek/poldek/pm/pkgdb.c:1.21 poldek/poldek/pm/pkgdb.c:1.22
--- poldek/poldek/pm/pkgdb.c:1.21	Mon Oct 24 17:25:58 2005
+++ poldek/poldek/pm/pkgdb.c	Sat Mar 18 16:18:04 2006
@@ -440,6 +440,9 @@
                                     tn_array *unistdbpkgs, unsigned ldflags)
 {
     tn_array *dbpkgs = NULL;
+
+    n_assert(db);
+    n_assert(cap);
     pkgdb_search(db, &dbpkgs, PMTAG_CAP, capreq_name(cap),
                  unistdbpkgs, ldflags);
     return dbpkgs;

================================================================
Index: poldek/poldek/uninstall.c
diff -u poldek/poldek/uninstall.c:1.37 poldek/poldek/uninstall.c:1.38
--- poldek/poldek/uninstall.c:1.37	Wed Oct 12 21:25:55 2005
+++ poldek/poldek/uninstall.c	Sat Mar 18 16:18:04 2006
@@ -407,7 +407,7 @@
     tn_array *dbpkgs;
     int i, nmatches = 0;
 
-    
+    n_assert(cr);
     DBGF("get_provides %s\n", capreq_snprintf_s(cr));
     dbpkgs = pkgdb_get_provides_dbpkgs(ts->db, cr, NULL, uninst_LDFLAGS);
 
@@ -464,8 +464,11 @@
     int            resolved = 0;
     
     cr = NULL; cr_evr = NULL;
-    
-    if ((p = strchr(mask, '#')) == NULL) {
+
+    /* No EVR mask or empty EVR (last char '#') */
+    if ((p = strchr(mask, '#')) == NULL || *(p + 1) == '\0') {
+        if (p)
+            *p = '\0';
         capreq_new_name_a(mask, cr);
             
     } else {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pm/pkgdb.c?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/poldek/poldek/uninstall.c?r1=1.37&r2=1.38&f=u