poldek: poldek/pkgset.c - bufix (Assertion 'n_array_size(vs.ordere...

mis mis at pld-linux.org
Tue Aug 22 17:08:35 CEST 2006


Author: mis                          Date: Tue Aug 22 15:08:35 2006 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- bufix (Assertion 'n_array_size(vs.ordered_pkgs) == n_array_size(pkgs)' failed)

---- Files affected:
poldek/poldek:
   pkgset.c (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgset.c
diff -u poldek/poldek/pkgset.c:1.89 poldek/poldek/pkgset.c:1.90
--- poldek/poldek/pkgset.c:1.89	Sun Aug 20 23:13:19 2006
+++ poldek/poldek/pkgset.c	Tue Aug 22 17:08:30 2006
@@ -550,8 +550,12 @@
     }
     
     for (i=0; i < n_array_size(tmp); i++) {
-        struct pkg *pkg = n_array_nth(tmp, i);
-        if (n_array_bsearch(ps->pkgs, pkg))
+        struct pkg *tmpkg, *pkg = n_array_nth(tmp, i);
+        
+        if (pkg_is_scored(pkg, (PKG_IGNORED | PKG_IGNORED_UNIQ)))
+            continue;
+        
+        if ((tmpkg = n_array_bsearch(ps->pkgs, pkg)) && tmpkg == pkg)
             n_array_push(pkgs, pkg_link(pkg));
     }
     n_array_free(tmp);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pkgset.c?r1=1.89&r2=1.90&f=u



More information about the pld-cvs-commit mailing list