From 1015446c571e56ec6a5b0f1aae497cbcf3fe6ef9 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 8 Feb 2006 15:11:47 +0000 Subject: Get rid of message() function --- urpm/msg.pm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'urpm/msg.pm') diff --git a/urpm/msg.pm b/urpm/msg.pm index 5d633ace..e46638b0 100644 --- a/urpm/msg.pm +++ b/urpm/msg.pm @@ -7,7 +7,7 @@ use Exporter; (our $VERSION) = q$Id$ =~ /(\d+\.\d+)/; our @ISA = 'Exporter'; -our @EXPORT = qw(N bug_log to_utf8 message_input message toMb from_utf8 sys_log); +our @EXPORT = qw(N bug_log to_utf8 message_input toMb from_utf8 sys_log); #- I18N. use Locale::gettext; @@ -93,20 +93,11 @@ sub message_input { } else { last; } - message(N("Sorry, bad choice, try again\n")); + print N("Sorry, bad choice, try again\n"); } return $input; } -sub message { - my ($msg) = @_; - if ($urpm::args::options{bug} || !defined fileno ::SAVEOUT) { - print STDOUT "$msg\n"; - } else { - print ::SAVEOUT "$msg\n"; - } -} - sub toMb { my $nb = $_[0] / 1024 / 1024; int $nb + 0.5; @@ -130,6 +121,6 @@ urpm::msg - routines to prompt messages from the urpm* tools Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA -Copyright (C) 2005 Mandriva SA +Copyright (C) 2005, 2006 Mandriva SA =cut -- cgit v1.2.1