aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-04-02 16:08:07 +0000
committerThierry Vignaud <tv@mandriva.org>2007-04-02 16:08:07 +0000
commit62e89cc0c01d10198a274f2ea3d49fd0e40de425 (patch)
treeeef7fd153e224f3add60acb16180ce7a891cc263
parent5a2ff32d72d702bf10ed2de7f8251629dfa92965 (diff)
downloadrpmdrake-62e89cc0c01d10198a274f2ea3d49fd0e40de425.tar
rpmdrake-62e89cc0c01d10198a274f2ea3d49fd0e40de425.tar.gz
rpmdrake-62e89cc0c01d10198a274f2ea3d49fd0e40de425.tar.bz2
rpmdrake-62e89cc0c01d10198a274f2ea3d49fd0e40de425.tar.xz
rpmdrake-62e89cc0c01d10198a274f2ea3d49fd0e40de425.zip
(deps_msg) revert #28613 workaround which causes UTF-8 issues (#30029)
as it is now really fixed in urpmi
-rw-r--r--Rpmdrake/gui.pm12
1 files changed, 1 insertions, 11 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 33364d31..be6519f5 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -441,18 +441,8 @@ sub deps_msg {
my @deps = sort { $a cmp $b } difference2($nodes_with_deps, $nodes);
@deps > 0 or return 1;
deps_msg_again:
- # workaround s/formatlistpkg()/urpm::select::translate_why_removed()/ introducing regression
- # in (un)selecting packages with deps (#28613):
- my $cmd = bg_command->new(sub {
- my $str = urpm::select::translate_why_removed($urpm, $urpm->{state}, @deps);
- print "$str\n";
- });
- my $fd = $cmd->{fd};
- my $reasons;
- local $_;
- $reasons .= $_ while <$fd>;
my $results = interactive_msg(
- $title, $msg . $reasons,
+ $title, $msg . urpm::select::translate_why_removed($urpm, $urpm->{state}, @deps),
yesno => [ N("Cancel"), N("More info"), N("Ok") ],
scroll => 1,
);