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

--- pkgcmp.c~	2008-02-02 22:49:04.000000000 +0100
+++ pkgcmp.c	2008-11-19 01:00:37.123524800 +0100
@@ -84,11 +84,8 @@
     if (pkg->color && candidate->color)
         return pkg->color & candidate->color;
 
-    /* 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
3a6613ff ER	1	--- pkgcmp.c~ 2008-02-02 22:49:04.000000000 +0100
	2	+++ pkgcmp.c 2008-11-19 01:00:37.123524800 +0100
	3	@@ -84,11 +84,8 @@
	4	if (pkg->color && candidate->color)
	5	return pkg->color & candidate->color;
	6
	7	- /* same name and candidate without color -> promote candidate */
	8	- if (pkg->color && pkg_is_kind_of(candidate, pkg))
	9	- return 1;
	10	-
	11	- return 0;
	12	+ /* either new or old package contains no binary files, let it happen */
	13	+ return 1;
	14	}
	15
	16	int pkg_eq_capreq(const struct pkg pkg, const struct capreq cr)