diff options
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/args.pm | 2 | ||||
| -rw-r--r-- | urpm/msg.pm | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/urpm/args.pm b/urpm/args.pm index a9010fe9..1acf0640 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -72,7 +72,7 @@ my %options_spec = ( 'no-remove|no-uninstall' => \$::no_remove, 'no-install|noinstall' => \$::no_install, keep => sub { $urpm->{options}{keep} = 1 }, - logfile => \$::logfile, + 'logfile=s' => \$::logfile, 'split-level=s' => sub { $urpm->{options}{'split-level'} = $_[1] }, 'split-length=s' => sub { $urpm->{options}{'split-length'} = $_[1] }, 'fuzzy!' => sub { $urpm->{options}{fuzzy} = $_[1] }, 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 |