aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-01-30 17:04:06 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-01-30 17:04:06 +0000
commita7a87957a0a44c3ed2137f60e88601b840b66e5c (patch)
tree74af2dbe1af68d00724ceebd60a23d7e4971ed36
parent20c3a0bab7981e581b8b9e461409f572268ff61f (diff)
downloadrpmdrake-a7a87957a0a44c3ed2137f60e88601b840b66e5c.tar
rpmdrake-a7a87957a0a44c3ed2137f60e88601b840b66e5c.tar.gz
rpmdrake-a7a87957a0a44c3ed2137f60e88601b840b66e5c.tar.bz2
rpmdrake-a7a87957a0a44c3ed2137f60e88601b840b66e5c.tar.xz
rpmdrake-a7a87957a0a44c3ed2137f60e88601b840b66e5c.zip
fix garbled characters for fatal and error msgs reported by urpm (needs to convert urpmi output to utf8)
-rwxr-xr-xrpmdrake4
-rw-r--r--rpmdrake.spec1
2 files changed, 3 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index f7a90269..6f63d2f5 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1099,8 +1099,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $fatal_msg;
my @error_msgs;
- local $urpm->{fatal} = sub { $fatal_msg = $_[1]; printf STDERR "Fatal: %s\n", $_[1]; goto fatal_error };
- local $urpm->{error} = sub { push @error_msgs, $_[0]; printf STDERR "Error: %s\n", $_[0] };
+ local $urpm->{fatal} = sub { $fatal_msg = to_utf8($_[1]); printf STDERR "Fatal: %s\n", $_[1]; goto fatal_error };
+ local $urpm->{error} = sub { push @error_msgs, to_utf8($_[0]); printf STDERR "Error: %s\n", $_[0] };
$w->{rwindow}->set_sensitive(0);
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 63c23c01..194e27c4 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 21 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.2-2mdk
- remove unneeded stuff from grpmi/po/*.po
+- fix garbled characters for fatal and error msgs reported by urpm
* Thu Jan 15 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.2-1mdk
- add ability to use rpmdrake/rpmdrake-remove with a "parallel"