aboutsummaryrefslogtreecommitdiffstats
path: root/URPM/Resolve.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-11 14:04:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-11 14:04:22 +0000
commit79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a (patch)
treed2b6008a1abe204fcbd455829a19cd4671f47132 /URPM/Resolve.pm
parent805733388ae7f658bb935a3b6b760885564f3af0 (diff)
downloadperl-URPM-79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a.tar
perl-URPM-79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a.tar.gz
perl-URPM-79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a.tar.bz2
perl-URPM-79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a.tar.xz
perl-URPM-79c39f6119b7e7308b5f7951b83e9b5e1e86ac1a.zip
simplify
Diffstat (limited to 'URPM/Resolve.pm')
-rw-r--r--URPM/Resolve.pm23
1 files changed, 11 insertions, 12 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index c647a7a..886df29 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -549,28 +549,27 @@ sub resolve_requested {
#- nodeps :
sub resolve_requested__no_suggests {
my ($urpm, $db, $state, $requested, %options) = @_;
- my (@diff_provides, @properties, @selected);
- #- populate properties with backtrack informations.
- while (my ($r, $v) = each %$requested) {
- unless ($options{keep_requested_flag}) {
+ if (!$options{keep_requested_flag}) {
+ foreach (keys %$requested) {
#- keep track of requested packages by propating the flag.
- foreach (find_candidate_packages_($urpm, $r)) {
- $_->set_flag_requested;
+ foreach (find_candidate_packages_($urpm, $_)) {
+ $_->set_flag_requested;
}
}
- #- keep value to be available from selected hash.
- push @properties, { required => $r,
- requested => $v,
- };
}
+ my @properties = map {
+ { required => $_, requested => $requested->{$_} };
+ } keys %$requested;
+
+ my (@diff_provides, @selected);
#- for each dep property evaluated, examine which package will be obsoleted on $db,
#- then examine provides that will be removed (which need to be satisfied by another
#- 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.
do {
- while (defined (my $dep = shift @properties)) {
+ while (my $dep = shift @properties) {
#- 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}) {
@@ -680,7 +679,7 @@ sub resolve_requested__no_suggests {
unshift @properties, backtrack_selected($urpm, $db, $state, +{ keep => \@keep, psel => $pkg }, %options);
}
}
- if (defined (my $diff = shift @diff_provides)) {
+ if (my $diff = shift @diff_provides) {
_handle_diff_provides($urpm, $db, $state, \@properties, $diff->{name}, $diff->{pkg}, %options);
}
} while @diff_provides || @properties;