diff options
| -rwxr-xr-x | urpmi | 18 | ||||
| -rw-r--r-- | urpmi.spec | 5 | ||||
| -rwxr-xr-x | urpmq | 8 |
3 files changed, 17 insertions, 14 deletions
@@ -166,14 +166,6 @@ my $ask_choice = sub { $choices_id[$n - 1]; }; -if ($minimal) { - $urpm->read_provides; - $urpm->read_config; - $urpm->filter_minimal_packages_to_upgrade(\%packages, $ask_choice); -} else { - $urpm->filter_packages_to_upgrade(\%packages, $ask_choice, complete => $complete); -} - #- auto select package for upgrading the distribution. if ($auto_select) { my (%to_remove, %keep_files); @@ -185,6 +177,14 @@ if ($auto_select) { } } +if ($minimal) { + $urpm->read_provides; + $urpm->read_config; + $urpm->filter_minimal_packages_to_upgrade(\%packages, $ask_choice); +} else { + $urpm->filter_packages_to_upgrade(\%packages, $ask_choice, complete => $complete); +} + #- get out of package that should not be upgraded. $urpm->deselect_unwanted_packages(\%packages); @@ -193,7 +193,7 @@ my @to_install; #- check if there is at least one package to install that #- has not been given by the user. -my $ask_user; +my $ask_user = $auto_select; my $sum = 0; foreach (keys %packages) { defined $packages{$_} and $ask_user = 1; @@ -2,7 +2,7 @@ Name: urpmi Version: 1.5 -Release: 9mdk +Release: 10mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -113,6 +113,9 @@ autoirpm.uninstall %changelog +* Mon Feb 26 2001 François Pons <fpons@mandrakesoft.com> 1.5-10mdk +- fixed auto-select flag to use dependancies resolver after. + * Mon Feb 26 2001 François Pons <fpons@mandrakesoft.com> 1.5-9mdk - fixed big bug of provides files completely read but only files should be extracted with no package description. @@ -112,10 +112,6 @@ $urpm->{params}->relocate_depslist(); my %packages; $urpm->search_packages(\%packages, [ @names ]) or $query->{force} or exit 1; -#- filter to add in packages selected required packages. -$query->{deps} && !$query->{upgrade} and $urpm->compute_closure(\%packages); -$query->{upgrade} and $urpm->filter_packages_to_upgrade(\%packages, complete => $query->{complete}); - #- auto select package for upgrading the distribution. if ($query->{auto_select}) { my (%to_remove, %keep_files); @@ -127,6 +123,10 @@ if ($query->{auto_select}) { } } +#- filter to add in packages selected required packages. +$query->{deps} && !$query->{upgrade} and $urpm->compute_closure(\%packages); +$query->{upgrade} and $urpm->filter_packages_to_upgrade(\%packages, complete => $query->{complete}); + #- get out of package that should not be upgraded. $urpm->deselect_unwanted_packages(\%packages); |