diff options
| -rwxr-xr-x | urpmi | 8 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
2 files changed, 8 insertions, 5 deletions
@@ -486,15 +486,15 @@ if (%sources_install || %sources) { $noexpr = _("Nn"); $yesexpr = _("Yy"); message_input(_("Try installation without checking dependencies? (y/N) "), $force && $yesexpr) =~ /[$yesexpr]/ - or exit 1; + or exit 1; $urpm->{log}("starting installing packages without deps"); - @l = $urpm->install($root, \%sources_install, \%sources, nodeps => 1); + @l = $urpm->install($root, [ keys %{$state->{ask_remove} || {}} ], \%sources_install, \%sources, nodeps => 1); if (@l) { message(_("Installation failed") . ":\n" . join("\n", @l)); message_input(_("Try installation even more strongly (--force)? (y/N) "), $force && $yesexpr) =~ /[$yesexpr]/ - or exit 1; + or exit 1; $urpm->{log}("starting force installing packages without deps"); - @l = $urpm->install($root, \%sources_install, \%sources, nodeps => 1, force => 1); + @l = $urpm->install($root, [ keys %{$state->{ask_remove} || {}} ], \%sources_install, \%sources, nodeps => 1, force => 1); @l and $urpm->fatal(2, _("Installation failed") . ":\n" . join("\n", @l)); } } @@ -2,7 +2,7 @@ Name: urpmi Version: 3.8 -Release: 1mdk +Release: 2mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -144,6 +144,9 @@ fi %changelog +* Mon Jul 22 2002 François Pons <fpons@mandrakesoft.com> 3.8-2mdk +- fixed no dependencies or forced install error. + * Fri Jul 19 2002 François Pons <fpons@mandrakesoft.com> 3.8-1mdk - removing, installing and upgrading packages is done in only one transaction. |