# HG changeset patch
# User Dan Winship <danw@gnome.org>
# Date 1205855068 14400
# Node ID eb67f195371031f2ce99287f6ffb1b790728f34f
# Parent  28196c52b37b742a81a8451f9a92e6bf71047afc# Parent  a23f91e78747277692ae5ef4fed88c940d65553d
Merge branch 'master' of git://people.freedesktop.org/~krh/razor

diff -r 28196c52b37b -r eb67f1953710 razor.c
--- a/razor.c	Fri Mar 14 15:32:24 2008 -0400
+++ b/razor.c	Tue Mar 18 11:44:28 2008 -0400
@@ -2004,7 +2004,8 @@
 	for (sp = spkgs; sp < send; sp++) {
 		while (up < uend && strcmp(&spool[sp->name], &upool[up->name]) > 0)
 			up++;
-		if (strcmp(&spool[sp->name], &upool[up->name]) == 0) {
+		if (strcmp(&spool[sp->name], &upool[up->name]) == 0 &&
+		    versioncmp(&spool[sp->version], &upool[up->version]) < 0) {
 			tp = array_add(&trans->packages, sizeof *tp);
 			memset(tp, 0, sizeof *tp);
 			tp->old_package = sp;