From c84ced75ca6a90579bdd530c08dfc3b8272c9273 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 10 Jul 2008 13:13:09 +0000 Subject: revert using --no-locales on urpmq, keep it a special case for now (for compat with urpmi < 6.1) --- urpm/parallel_ka_run.pm | 5 ++++- urpm/parallel_ssh.pm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'urpm') diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index b1f5dc65..1d9cb5d6 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -28,7 +28,10 @@ $rshp_command ||= 'rshp'; sub _rshp_urpm { my ($parallel, $urpm, $rshp_option, $cmd, $para) = @_; - my $command = "$rshp_command $rshp_option $parallel->{options} -- $cmd --no-locales $para"; + # it doesn't matter for urpmq, and previous version of urpmq didn't handle it: + $cmd ne 'urpmq' and $para = "--no-locales $para"; + + my $command = "$rshp_command $rshp_option $parallel->{options} -- $cmd $para"; $urpm->{log}("parallel_ka_run: $command"); $command; } diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index d2a55513..b2716e37 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -56,7 +56,10 @@ sub _ssh_urpm { $cmd ne 'urpme' && _localhost($node) and $para = "--nolock $para"; - my $command = _ssh($node) . " $cmd --no-locales $para"; + # it doesn't matter for urpmq, and previous version of urpmq didn't handle it: + $cmd ne 'urpmq' and $para = "--no-locales $para"; + + my $command = _ssh($node) . " $cmd $para"; $urpm->{log}("parallel_ssh: $command"); $command; } -- cgit v1.2.1