Merge branch 'master' of git://people.freedesktop.org/~krh/razor
authorDan Winship <danw@gnome.org>
Tue Mar 18 11:44:28 2008 -0400 (2008-03-18)
changeset 182eb67f1953710
parent 181 28196c52b37b
parent 177 a23f91e78747
child 183 8f4402ee125d
Merge branch 'master' of git://people.freedesktop.org/~krh/razor
     1.1 --- a/razor.c	Fri Mar 14 15:32:24 2008 -0400
     1.2 +++ b/razor.c	Tue Mar 18 11:44:28 2008 -0400
     1.3 @@ -2004,7 +2004,8 @@
     1.4  	for (sp = spkgs; sp < send; sp++) {
     1.5  		while (up < uend && strcmp(&spool[sp->name], &upool[up->name]) > 0)
     1.6  			up++;
     1.7 -		if (strcmp(&spool[sp->name], &upool[up->name]) == 0) {
     1.8 +		if (strcmp(&spool[sp->name], &upool[up->name]) == 0 &&
     1.9 +		    versioncmp(&spool[sp->version], &upool[up->version]) < 0) {
    1.10  			tp = array_add(&trans->packages, sizeof *tp);
    1.11  			memset(tp, 0, sizeof *tp);
    1.12  			tp->old_package = sp;