1.1 --- a/razor.c	Tue Mar 11 17:49:00 2008 -0400
     1.2 +++ b/razor.c	Tue Mar 11 18:08:12 2008 -0400
     1.3 @@ -2292,7 +2292,12 @@
     1.4  			if (already->new_package == new_package) {
     1.5  				/* Already taken care of */
     1.6  				return;
     1.7 +			} else if (new_package_set == trans->upstream &&
     1.8 +				   already->state == RAZOR_PACKAGE_FORCED_UPDATE) {
     1.9 +				already->new_package = new_package;
    1.10 +				return;
    1.11  			}
    1.12 +
    1.13  			/* Oops. We lose */
    1.14  			if (state != RAZOR_PACKAGE_CONTRADICTION)
    1.15  				contradiction = 1;
    1.16 @@ -2304,7 +2309,11 @@
    1.17  			if (already->old_package == old_package) {
    1.18  				/* Already taken care of */
    1.19  				return;
    1.20 +			} else if (old_package_set == trans->system) {
    1.21 +				already->old_package = old_package;
    1.22 +				return;
    1.23  			}
    1.24 +
    1.25  			/* Oops. We lose */
    1.26  			if (state != RAZOR_PACKAGE_CONTRADICTION)
    1.27  				contradiction = 1;