aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--URPM/Resolve.pm8
-rw-r--r--perl-URPM.spec6
2 files changed, 9 insertions, 5 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 33ab551..fb7f8b8 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -512,16 +512,16 @@ sub resolve_requested {
foreach my $n (keys %diff_provides) {
$db->traverse_tag('whatrequires', [ $n ], sub {
my ($p) = @_;
- if (my @l = $urpm->unsatisfied_requires($db, $state, $p, nopromoteepoch => 1)) {
+ if (my @l = $urpm->unsatisfied_requires($db, $state, $p, nopromoteepoch => 0)) {
#- try if upgrading the package will be satisfying all the requires
#- else it will be necessary to ask the user for removing it.
my $packages = $urpm->find_candidate_packages($p->name,
- nopromoteepoch => 1,
+ nopromoteepoch => 0,
avoided => $state->{rejected});
my $best = join '|', map { $_->id }
grep { $_->fullname ne $p->fullname &&
$urpm->unsatisfied_requires($db, $state, $_,
- nopromoteepoch => 1,
+ nopromoteepoch => 0,
name => $n) == 0 }
@{$packages->{$p->name}};
@@ -533,7 +533,7 @@ sub resolve_requested {
my @best;
foreach (@l) {
$packages = $urpm->find_candidate_packages($_,
- nopromoteepoch => 1,
+ nopromoteepoch => 0,
avoided => $state->{rejected});
$best = join('|',
map { $_->id }
diff --git a/perl-URPM.spec b/perl-URPM.spec
index 47bff60..9bcdf8f 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -1,7 +1,7 @@
%define name perl-URPM
%define real_name URPM
%define version 0.91
-%define release 7mdk
+%define release 8mdk
%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
@@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 4 2003 François Pons <fpons@mandrakesoft.com> 0.91-8mdk
+- removed handling of promoteepoch as it is specifically obscure
+ in rpm and make urpmi crazy.
+
* Thu Jun 26 2003 François Pons <fpons@mandrakesoft.com> 0.91-7mdk
- fixed possible transaction set build even for empty selection.
- fixed whatrequires hash abnormally populated (no problem raised).