diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-12 10:07:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-12 10:07:27 +0000 |
| commit | 8c5ec672d46984d4470d0ba74c0d20289682b590 (patch) | |
| tree | 1d66bbade65975a08eb3a51887535439427eea04 | |
| parent | c76e3e2d87a9feab1aaab6cf24abde2e3fdad88d (diff) | |
| download | perl-URPM-8c5ec672d46984d4470d0ba74c0d20289682b590.tar perl-URPM-8c5ec672d46984d4470d0ba74c0d20289682b590.tar.gz perl-URPM-8c5ec672d46984d4470d0ba74c0d20289682b590.tar.bz2 perl-URPM-8c5ec672d46984d4470d0ba74c0d20289682b590.tar.xz perl-URPM-8c5ec672d46984d4470d0ba74c0d20289682b590.zip | |
move var declaration where it's used
| -rw-r--r-- | URPM/Resolve.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 5469740..54a21ce 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -666,9 +666,6 @@ sub resolve_requested__no_suggests_ { my $pkg = _choose_required($urpm, $db, $state, $dep, \@properties, %options) or next; - #- cancel flag if this package should be cancelled but too late (typically keep options). - my @keep; - !$pkg || exists $state->{selected}{$pkg->id} and next; if ($pkg->arch eq 'src') { @@ -716,6 +713,9 @@ sub resolve_requested__no_suggests_ { $state->{whatrequires}{$_}{$pkg->id} = undef; } + #- cancel flag if this package should be cancelled but too late (typically keep options). + my @keep; + _handle_conflicts($urpm, $db, $state, $pkg, \@properties, $options{keep} && \@keep); #- examine if an existing package does not conflict with this one. |