diff options
| -rwxr-xr-x | urpmi | 24 | ||||
| -rw-r--r-- | urpmi.spec | 5 | ||||
| -rwxr-xr-x | urpmq | 8 |
3 files changed, 20 insertions, 17 deletions
@@ -1,4 +1,3 @@ -#!/usr/bin/perl #!/usr/bin/perl -T #- Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com) @@ -141,17 +140,6 @@ $urpm->relocate_depslist; my %packages; $urpm->search_packages(\%packages, [ ($minimal ? () : ('basesystem')), @names], all => $all) or $force or exit 1; -#- auto select package for upgrading the distribution. -if ($auto_select) { - my (%to_remove, %keep_files); - - $urpm->select_packages_to_upgrade('', \%packages, \%to_remove, \%keep_files); - - if (keys(%to_remove) > 0) { - print STDERR "some package have to be removed for being upgraded, this is not supported yet\n"; - } -} - #- filter to add in packages selected required packages. my $ask_choice = sub { my ($urpm, @choices_id) = @_; @@ -177,6 +165,7 @@ my $ask_choice = sub { $choices_id[$n - 1]; }; + if ($minimal) { $urpm->read_provides; $urpm->read_config; @@ -185,6 +174,17 @@ if ($minimal) { $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); + + $urpm->select_packages_to_upgrade('', \%packages, \%to_remove, \%keep_files); + + if (keys(%to_remove) > 0) { + print STDERR "some package have to be removed for being upgraded, this is not supported yet\n"; + } +} + #- get out of package that should not be upgraded. $urpm->deselect_unwanted_packages(\%packages); @@ -2,7 +2,7 @@ Name: urpmi Version: 1.5 -Release: 7mdk +Release: 8mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -113,6 +113,9 @@ autoirpm.uninstall %changelog +* Fri Feb 23 2001 François Pons <fpons@mandrakesoft.com> 1.5-8mdk +- fix --auto-select and skip list. + * Fri Feb 23 2001 François Pons <fpons@mandrakesoft.com> 1.5-7mdk - added /etc/urpmi/skip.list for package that should not be upgraded. @@ -112,6 +112,10 @@ $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); @@ -126,10 +130,6 @@ if ($query->{auto_select}) { #- get out of package that should not be upgraded. $urpm->deselect_unwanted_packages(\%packages); -#- 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}); - if ($query->{headers}) { $urpm->read_config(); |