From 162a434adbfca7aae278435d51da88af90eff10a Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Fri, 27 Mar 2009 10:28:34 +0000
Subject: Revert part of the fix for bug #47803 since it breaks upgrades from
 2008.1

---
 NEWS            | 3 +++
 URPM/Resolve.pm | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 0c807b9..5349c95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- revert part of the fix for bug #47803 because it's breaking upgrades
+  from 2008.1
+
 Version 3.28 - 25 March 2009, by Christophe Fergeau
 
 - postpone user choices as much as possible to avoid asking the user
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 5cd7480..ef956cc 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1235,13 +1235,11 @@ sub _handle_diff_provides {
 		} elsif ($options{keep}) {
 		    backtrack_selected_psel_keep($urpm, $db, $state, $pkg, [ scalar $p->fullname ]);
 		} else {
-		    my %diff_provides_h;
-		    set_rejected_and_compute_diff_provides($urpm, $state, \%diff_provides_h, {
+		    resolve_rejected_($urpm, $db, $state, $properties, {
 				      rejected_pkg => $p, removed => 1,
 				      from => $pkg,
 				      why => { unsatisfied => \@unsatisfied },
 				  });
-		    push @$diff_provides, map { +{ name => $_, pkg => $pkg } } keys %diff_provides_h;
 		}
 	    }
 	}
-- 
cgit v1.2.1