diff options
| -rw-r--r-- | urpm.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 8 | ||||
| -rw-r--r-- | urpmi.spec | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -1102,7 +1102,7 @@ sub filter_minimal_packages_to_upgrade { exists $packages->{$choices[0]{id}} or $packages->{$choices[0]{id}} = 1; unshift @packages, $choices[0]{id}; } else { - push @packages, [ sort { $a->{id} <=> $b->{id} } @choices ]; + push @packages, [ sort { $a <=> $b } map { $_->{id} } @choices ]; } } } @@ -285,14 +285,14 @@ sub install { $noexpr = _("Nn"); $yesexpr = _("Yy"); - print SAVEOUT _("Try installation without checking dependencies? (Y/n) "); - $force or <STDIN> =~ /[$noexpr]/ and exit 1; + print SAVEOUT _("Try installation without checking dependencies? (y/N) "); + $force or <STDIN> =~ /[$yesexpr]/ or exit 1; system("rpm", $rpm_opt, "--nodeps", @_); if ($?) { message(_("Installation failed")); - print SAVEOUT _("Try installation even more strongly (--force)? (Y/n) "); - $force or <STDIN> =~ /[$noexpr]/ and exit 0; + print SAVEOUT _("Try installation even more strongly (--force)? (y/N) "); + $force or <STDIN> =~ /[$yesexpr]/ or exit 0; system("rpm", $rpm_opt, "--nodeps", "--force", @_); } } @@ -2,7 +2,7 @@ Name: urpmi Version: 1.5 -Release: 16mdk +Release: 17mdk License: GPL Source0: %{name}.tar.bz2 Summary: User mode rpm install @@ -113,6 +113,10 @@ autoirpm.uninstall %changelog +* Mon Mar 5 2001 François Pons <fpons@mandrakesoft.com> 1.5-17mdk +- fixed ask choices for urpmi -m mode. +- changed default behaviour to abort transaction on error. + * Mon Mar 5 2001 François Pons <fpons@mandrakesoft.com> 1.5-16mdk - make sure to kill sub process that are doing log to avoid lock. |