diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-05-17 08:40:29 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-05-17 08:40:29 +0000 |
commit | 4a2621670c2bfb2c5307debbe72cc27f03677f3d (patch) | |
tree | 43c5bffc2bd63297e58da5d10a4d121c50b3f96a | |
parent | 97f9c58de6e3ac57f292b3799835ce4fb7c369f8 (diff) | |
download | rpmdrake-4a2621670c2bfb2c5307debbe72cc27f03677f3d.tar rpmdrake-4a2621670c2bfb2c5307debbe72cc27f03677f3d.tar.gz rpmdrake-4a2621670c2bfb2c5307debbe72cc27f03677f3d.tar.bz2 rpmdrake-4a2621670c2bfb2c5307debbe72cc27f03677f3d.tar.xz rpmdrake-4a2621670c2bfb2c5307debbe72cc27f03677f3d.zip |
Some warning messages could be truncated.
-rwxr-xr-x | rpmdrake | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -593,7 +593,9 @@ or you already installed all of them.")); my @reasons = map { my $cant = $_; my $unsel = find { remove_arch($_) eq $cant } @ask_unselect; - $unsel ? to_utf8($urpm->translate_why_unselected($urpm->{state}, $unsel)) : $cant; + $unsel + ? to_utf8(join "\n", $urpm->translate_why_unselected($urpm->{state}, $unsel)) + : $cant; } @cant; interactive_msg_(N("Some packages can't be installed"), N("Sorry, the following package(s) can't be selected:\n\n%s", join("\n", @reasons))); @@ -892,12 +894,17 @@ Do you really want to install all the selected packages?"), yesno => 1) } if ($MODE ne 'remove') { @{$urpm->{ask_remove}} = sort $urpm->removed_packages($urpm->{state}); - @{$urpm->{ask_remove}} and (interactive_msg_(N("Some packages need to be removed"), + if (@{$urpm->{ask_remove}}) { + my $r = join "\n", $urpm->translate_why_removed($urpm->{state}, @{$urpm->{ask_remove}}); + interactive_msg_(N("Some packages need to be removed"), N("The following packages have to be removed for others to be upgraded: %s -Is it ok to continue?", to_utf8($urpm->translate_why_removed($urpm->{state}, @{$urpm->{ask_remove}}))), yesno => 1) or return); +Is it ok to continue?", + to_utf8($r)), + yesno => 1) or return; + } } if (!$callback_action->($urpm, $pkgs)) { ($urpm, $pkgs, $descriptions) = $pkgs_provider->({ skip_updating_mu => 1 }); |