summaryrefslogtreecommitdiffstats
path: root/urpm/install.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-08-11 15:50:38 +0000
committerThierry Vignaud <tv@mandriva.org>2009-08-11 15:50:38 +0000
commit851d102e779e84d843a71b9f5a730be59b5e69c0 (patch)
treeeb1aca2f5990431ae29e83c85402dd1411eadc99 /urpm/install.pm
parent67bbf4e2bcb1ece11f00d13845b08b35a46cbcb5 (diff)
downloadurpmi-851d102e779e84d843a71b9f5a730be59b5e69c0.tar
urpmi-851d102e779e84d843a71b9f5a730be59b5e69c0.tar.gz
urpmi-851d102e779e84d843a71b9f5a730be59b5e69c0.tar.bz2
urpmi-851d102e779e84d843a71b9f5a730be59b5e69c0.tar.xz
urpmi-851d102e779e84d843a71b9f5a730be59b5e69c0.zip
(install,run) prevent garbaging text installer (#50776)
rationale: all prints in transaction/installation code now go through a callback that redirects the output at install time
Diffstat (limited to 'urpm/install.pm')
-rw-r--r--urpm/install.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/urpm/install.pm b/urpm/install.pm
index 675bd872..2ff075ca 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -256,7 +256,7 @@ sub install {
$urpm->{log}("removing upgraded package $fullname");
} else {
$callback_report_uninst and $callback_report_uninst->(N("Removing package %s", $fullname));
- print N("removing package %s", $fullname), "\n" if $verbose >= 0;
+ $urpm->{print}(N("removing package %s", $fullname)) if $verbose >= 0;
}
$index++;
}
@@ -280,9 +280,10 @@ sub install {
if ($options{verbose} >= 0) {
foreach (keys %{$urpm->{readmes}}) {
- print "-" x 70, "\n", N("More information on package %s", $urpm->{readmes}{$_}), "\n";
- print cat_utf8(($urpm->{root} || '') . $_);
- print "-" x 70, "\n";
+ $urpm->{print}("-" x 70 . "\n" .
+ N("More information on package %s", $urpm->{readmes}{$_}));
+ $urpm->{print}(scalar cat_utf8(($urpm->{root} || '') . $_));
+ $urpm->{print}("-" x 70);
}
}
}