aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-06-18 16:53:17 +0000
committerFrancois Pons <fpons@mandriva.com>2003-06-18 16:53:17 +0000
commitcd24c7bdba62608307820ce53d7ab218f6c85929 (patch)
tree0f854575b431c3c706eae9e4e73e0b0e6ef1193a
parentd08e53b8320807a33d8c6884808d47cea3e6bca5 (diff)
downloadperl-URPM-cd24c7bdba62608307820ce53d7ab218f6c85929.tar
perl-URPM-cd24c7bdba62608307820ce53d7ab218f6c85929.tar.gz
perl-URPM-cd24c7bdba62608307820ce53d7ab218f6c85929.tar.bz2
perl-URPM-cd24c7bdba62608307820ce53d7ab218f6c85929.tar.xz
perl-URPM-cd24c7bdba62608307820ce53d7ab218f6c85929.zip
0.91-4mdk
-rw-r--r--URPM/Resolve.pm8
-rw-r--r--perl-URPM.spec2
2 files changed, 7 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 5e5df28..6a4f104 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -255,6 +255,7 @@ sub backtrack_selected {
$state->{rejected}{$_->fullname}{backtrack}{closure}{$dep->{from}->fullname} = undef;
}
}
+ print STDERR "+++".$urpm->{depslist}[$dep->{required}]->fullname."\n";
#- the package is already rejected, we assume we can add another reason here!
push @{$state->{rejected}{$dep->{from}->fullname}{backtrack}{unsatisfied}}, $dep->{required};
}
@@ -365,6 +366,7 @@ sub resolve_requested {
#- package present or by a new package to upgrade), then requires not satisfied and
#- finally conflicts that will force a new upgrade or a remove.
while (defined ($dep = shift @properties)) {
+ print STDERR ">>required=$dep->{required}<< >>requested=$dep->{requested}<< >>from=".eval{$dep->{from}->fullname.""}."\n";
#- in case of keep_unrequested_dependencies option is not set, we need to avoid
#- selecting packages if the source has been disabled.
if (exists $dep->{from} && !$options{keep_unrequested_dependencies}) {
@@ -516,7 +518,7 @@ sub resolve_requested {
@{$packages->{$p->name}};
if (length $best) {
- push @properties, { required => $best, from => $pkg, promote => $n };
+ push @properties, { required => $best, promote => $n };
} else {
#- no package have been found, we may need to remove the package examined unless
#- there exists a package that provided the unsatisfied requires.
@@ -530,7 +532,7 @@ sub resolve_requested {
}
if (@best == @l) {
- push @properties, map { +{ required => $_, from => $pkg, promote => $n } } @best;
+ push @properties, map { +{ required => $_, promote => $n } } @best;
} else {
$urpm->resolve_rejected($db, $state, $p,
removed => 1, unsatisfied => \@properties,
@@ -583,7 +585,7 @@ sub resolve_requested {
@{$packages->{$p->name}};
if (length $best) {
- push @properties, { required => $best, from => $pkg, promote_conflicts => $name };
+ push @properties, { required => $best, promote_conflicts => $name };
} else {
#- no package have been found, we need to remove the package examined.
$urpm->resolve_rejected($db, $state, $p,
diff --git a/perl-URPM.spec b/perl-URPM.spec
index 037586e..626401b 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -53,6 +53,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jun 18 2003 François Pons <fpons@mandrakesoft.com> 0.91-4mdk
- fixed installation of old package due to missing closure.
+- fixed nodeps option to used for building transaction set.
+- fixed too many from source propagated which were not legal.
* Wed Jun 18 2003 François Pons <fpons@mandrakesoft.com> 0.91-3mdk
- fixed obssoletes on virtual provides not taken into account.