From 39a114a0b2e7c2a421ceaf594675ec336d288df0 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 6 Dec 2004 13:25:58 +0000
Subject: Fix loading of urpm::msg::N() in urpm::args, and urpmi's --no-locale
 option

---
 urpm/args.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'urpm')

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,
-- 
cgit v1.2.1