aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2006-07-05 16:36:38 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2006-07-05 16:36:38 +0000
commit5e77147dde35271252871808dc0acf823e1fd798 (patch)
tree6b44520dd0dda7db44557f5edf5f8f82054c3910
parent3a17bb2854fb676f1d7eb63f8a2477ba8e567cb7 (diff)
downloadrpmdrake-5e77147dde35271252871808dc0acf823e1fd798.tar
rpmdrake-5e77147dde35271252871808dc0acf823e1fd798.tar.gz
rpmdrake-5e77147dde35271252871808dc0acf823e1fd798.tar.bz2
rpmdrake-5e77147dde35271252871808dc0acf823e1fd798.tar.xz
rpmdrake-5e77147dde35271252871808dc0acf823e1fd798.zip
urpmi's error messages are already in UTF-8
-rwxr-xr-xrpmdrake10
-rw-r--r--rpmdrake.pm2
2 files changed, 6 insertions, 6 deletions
diff --git a/rpmdrake b/rpmdrake
index 32ccbd26..8be0d40c 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -830,7 +830,7 @@ or you already installed all of them."));
my $cant = $_;
my $unsel = find { remove_arch($_) eq $cant } @ask_unselect;
$unsel
- ? to_utf8(join "\n", $urpm->translate_why_unselected($urpm->{state}, $unsel))
+ ? join("\n", $urpm->translate_why_unselected($urpm->{state}, $unsel))
: ($pkgs->{$_}{pkg}->flag_skip ? N("%s (belongs to the skip list)", $cant) : $cant);
} @cant;
interactive_msg_(
@@ -1134,7 +1134,7 @@ N("The following packages have to be removed for others to be upgraded:
%s
Is it ok to continue?",
- to_utf8($r)),
+ $r),
scroll => 1,
yesno => 1) or return;
}
@@ -1536,8 +1536,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my @error_msgs;
my %Readmes;
my $statusbar_msg_id;
- local $urpm->{fatal} = sub { printf STDERR "Fatal: %s\n", $_[1]; $fatal_msg = to_utf8($_[1]); goto fatal_error };
- local $urpm->{error} = sub { printf STDERR "Error: %s\n", $_[0]; push @error_msgs, to_utf8($_[0]) };
+ local $urpm->{fatal} = sub { printf STDERR "Fatal: %s\n", $_[1]; $fatal_msg = $_[1]; goto fatal_error };
+ local $urpm->{error} = sub { printf STDERR "Error: %s\n", $_[0]; push @error_msgs, $_[0] };
$w->{rwindow}->set_sensitive(0);
@@ -1635,7 +1635,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
interactive_msg_(
N("Rpmdrake"),
N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?",
- to_utf8(join "\n", sort @invalid_sources)), yesno => 1, if_(@invalid_sources > 10, scroll => 1),
+ join("\n", sort @invalid_sources)), yesno => 1, if_(@invalid_sources > 10, scroll => 1),
) or goto return_with_error;
}
}
diff --git a/rpmdrake.pm b/rpmdrake.pm
index bdfcdd21..fa710811 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -794,7 +794,7 @@ sub add_medium_and_check {
my @newnames = ($_[0]); #- names of added media
my $fatal_msg;
my @error_msgs;
- local $urpm->{fatal} = sub { printf STDERR "Fatal: %s\n", $_[1]; $fatal_msg = to_utf8($_[1]); goto fatal_error };
+ local $urpm->{fatal} = sub { printf STDERR "Fatal: %s\n", $_[1]; $fatal_msg = $_[1]; goto fatal_error };
local $urpm->{error} = sub { printf STDERR "Error: %s\n", $_[0]; push @error_msgs, $_[0] };
if ($options->{distrib}) {
@newnames = $urpm->add_distrib_media(@_);