aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-07 15:06:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-07 15:06:52 +0000
commit2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909 (patch)
treee68253ca9dfcad855a08ffb69091c023bf856b80
parente33b4d554c02fd516d62fbcbf981e9596273b565 (diff)
downloadperl-URPM-2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909.tar
perl-URPM-2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909.tar.gz
perl-URPM-2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909.tar.bz2
perl-URPM-2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909.tar.xz
perl-URPM-2b8fca4ed6e4b28e6e8906e727ef268a3ccf9909.zip
re-use same code for conflict from installed package as is used for conflict
from selected package. this fixes test_gh() from urpmi split-transactions--promote test case
-rw-r--r--URPM/Resolve.pm11
1 files changed, 1 insertions, 10 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index c7c372f..87a7abf 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -775,16 +775,7 @@ sub resolve_requested__no_suggests {
my ($p) = @_;
foreach my $property ($p->conflicts) {
if ($pkg->provides_overlap($property)) {
- $urpm->{debug_URPM}("installed package " . $p->fullname . " is conflicting with " . $pkg->fullname . " (Conflicts: $property)") if $urpm->{debug_URPM};
- if ($options{keep}) {
- push @keep, scalar $p->fullname;
- } else {
- #- all these packages should be removed.
- $urpm->resolve_rejected($db, $state, $p,
- removed => 1, unsatisfied => \@properties,
- from => scalar $pkg->fullname,
- why => { conflicts => $property });
- }
+ _handle_provides_overlap($urpm, $db, $state, $pkg, $p, $property, $pkg->name, \@properties, $options{keep} && \@keep);
}
}
});