summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-06 13:25:58 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-06 13:25:58 +0000
commit39a114a0b2e7c2a421ceaf594675ec336d288df0 (patch)
treefe9086623b5dcc71a2f2f6b96e2bf73f4b9181cf
parent8f0bc0fb70552ca81b5a000d6dbced21cea01e8a (diff)
downloadurpmi-39a114a0b2e7c2a421ceaf594675ec336d288df0.tar
urpmi-39a114a0b2e7c2a421ceaf594675ec336d288df0.tar.gz
urpmi-39a114a0b2e7c2a421ceaf594675ec336d288df0.tar.bz2
urpmi-39a114a0b2e7c2a421ceaf594675ec336d288df0.tar.xz
urpmi-39a114a0b2e7c2a421ceaf594675ec336d288df0.zip
Fix loading of urpm::msg::N() in urpm::args, and urpmi's --no-locale option
-rw-r--r--urpm/args.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index c5b375de..10da6b9b 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -5,6 +5,7 @@ use warnings;
no warnings 'once';
use Getopt::Long;# 2.33;
use urpm::download;
+use urpm::msg;
# The program that invokes us
(my $tool = $0) =~ s!.*/!!;
@@ -39,12 +40,14 @@ my %options_spec = (
if (defined &::usage) { ::usage() } else { die "No help defined\n" }
},
"no-locales" => sub {
- require urpm::msg; # make sure it has been loaded
undef *::N;
undef *urpm::N;
undef *urpm::msg::N;
undef *urpm::args::N;
+ undef *urpm::cfg::N;
+ undef *urpm::download::N;
*::N = *urpm::N = *urpm::msg::N = *urpm::args::N
+ = *urpm::cfg::N = *urpm::download::N
= sub { my ($f, @p) = @_; sprintf($f, @p) };
},
update => \$::update,