[packages/poldek.git] / poldek-nocolor-upgrade.patch

--- pkgcmp.c~	2008-11-19 01:12:49.000000000 +0100
+++ pkgcmp.c	2008-11-19 01:13:36.125519583 +0100
@@ -82,13 +82,10 @@
         return 1;
     
     if (pkg->color && candidate->color)
-        return pkg->color & candidate->color;
+        return (pkg->color & candidate->color) > 0;
 
-    /* same name and candidate without color -> promote candidate */
-    if (pkg->color && pkg_is_kind_of(candidate, pkg)) 
-        return 1;
-
-    return 0;
+    /* either new or old package contains no binary files, let it happen */
+    return 1;
 }
 
 int pkg_eq_capreq(const struct pkg *pkg, const struct capreq *cr)
Commit	Line	Data
517e249f	1	--- pkgcmp.c~ 2008-11-19 01:12:49.000000000 +0100
	2	+++ pkgcmp.c 2008-11-19 01:13:36.125519583 +0100
	3	@@ -82,13 +82,10 @@
	4	return 1;
	5
	6	if (pkg->color && candidate->color)
	7	- return pkg->color & candidate->color;
	8	+ return (pkg->color & candidate->color) > 0;
	9
	10	- /* same name and candidate without color -> promote candidate */
	11	- if (pkg->color && pkg_is_kind_of(candidate, pkg))
	12	- return 1;
	13	-
	14	- return 0;
	15	+ /* either new or old package contains no binary files, let it happen */
	16	+ return 1;
	17	}
	18
	19	int pkg_eq_capreq(const struct pkg pkg, const struct capreq cr)