summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-02-28 16:06:27 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-02-28 16:06:27 +0000
commit2ac48e31e29158fea35fa7664c494592258405d7 (patch)
treefc03e6c3a68f98a9b2d25e518a3e7003b1c91200
parent62ebea1df52c0808bd8ab7d31e0117e491252138 (diff)
downloadurpmi-2ac48e31e29158fea35fa7664c494592258405d7.tar
urpmi-2ac48e31e29158fea35fa7664c494592258405d7.tar.gz
urpmi-2ac48e31e29158fea35fa7664c494592258405d7.tar.bz2
urpmi-2ac48e31e29158fea35fa7664c494592258405d7.tar.xz
urpmi-2ac48e31e29158fea35fa7664c494592258405d7.zip
Less verbosity with urpmi -q
-rw-r--r--urpm.pm2
-rwxr-xr-xurpmi2
2 files changed, 2 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index a76fcbd1..bbedfbda 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3030,7 +3030,7 @@ sub install {
for ($pkg->files) { /\bREADME(\.$trtype)?\.urpmi$/ and $readmes{$_} = $fullname }
close $fh if defined $fh;
};
- if (scalar keys %$install || scalar keys %$upgrade) {
+ if ($::verbose >= 0 && (scalar keys %$install || scalar keys %$upgrade)) {
$options{callback_inst} ||= \&install_logger;
$options{callback_trans} ||= \&install_logger;
}
diff --git a/urpmi b/urpmi
index 0fb9954b..1ef41c1d 100755
--- a/urpmi
+++ b/urpmi
@@ -329,7 +329,7 @@ if (exists $urpm->{options}{'priority-upgrade'} && $urpm->{options}{'priority-up
}
if ($auto_update && !$bug && !$env) {
#- For translators : there are several media here
- print N("Updating media..."), "\n";
+ $urpm->{log}(N("Updating media...\n"));
#- FIXME we need to configure it twice; otherwise
#- some settings are lost (like the skiplist) for
#- some reason.